1
=== modified file 'account/account.py'
2
--- account/account.py	2013-04-29 15:14:10 +0000
3
+++ account/account.py	2013-06-03 06:13:34 +0000
4
@@ -288,8 +288,12 @@
5
288
        children_and_consolidated = self._get_children_and_consol(cr, uid, ids, context=context)
288
        children_and_consolidated = self._get_children_and_consol(cr, uid, ids, context=context)
6
289
        #compute for each account the balance/debit/credit from the move lines
289
        #compute for each account the balance/debit/credit from the move lines
7
290
        accounts = {}
290
        accounts = {}
8
291
<<<<<<< TREE
9
291
        res = {}
292
        res = {}
10
292
        null_result = dict((fn, 0.0) for fn in field_names)
293
        null_result = dict((fn, 0.0) for fn in field_names)
11
294
=======
12
295
        sums = {}
13
296
>>>>>>> MERGE-SOURCE
14
293
        if children_and_consolidated:
297
        if children_and_consolidated:
15
294
            aml_query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
298
            aml_query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
16
295
299
17
@@ -321,7 +325,6 @@
18
321
            # consolidate accounts with direct children
325
            # consolidate accounts with direct children
19
322
            children_and_consolidated.reverse()
326
            children_and_consolidated.reverse()
20
323
            brs = list(self.browse(cr, uid, children_and_consolidated, context=context))
327
            brs = list(self.browse(cr, uid, children_and_consolidated, context=context))
21
324
            sums = {}
22
325
            currency_obj = self.pool.get('res.currency')
328
            currency_obj = self.pool.get('res.currency')
23
326
            while brs:
329
            while brs:
24
327
                current = brs.pop(0)
330
                current = brs.pop(0)
25
@@ -341,6 +344,7 @@
26
341
                            sums[current.id][fn] += sums[child.id][fn]
344
                            sums[current.id][fn] += sums[child.id][fn]
27
342
                        else:
345
                        else:
28
343
                            sums[current.id][fn] += currency_obj.compute(cr, uid, child.company_id.currency_id.id, current.company_id.currency_id.id, sums[child.id][fn], context=context)
346
                            sums[current.id][fn] += currency_obj.compute(cr, uid, child.company_id.currency_id.id, current.company_id.currency_id.id, sums[child.id][fn], context=context)
29
347
<<<<<<< TREE
30
344
348
31
345
                # as we have to relay on values computed before this is calculated separately than previous fields
349
                # as we have to relay on values computed before this is calculated separately than previous fields
32
346
                if current.currency_id and current.exchange_rate and \
350
                if current.currency_id and current.exchange_rate and \
33
@@ -357,6 +361,13 @@
34
357
            for id in ids:
361
            for id in ids:
35
358
                res[id] = null_result
362
                res[id] = null_result
36
359
        return res
363
        return res
37
364
=======
38
365
        res = {}
39
366
        null_result = dict((fn, 0.0) for fn in field_names)
40
367
        for id in ids:
41
368
            res[id] = sums.get(id, null_result)
42
369
        return res
43
370
>>>>>>> MERGE-SOURCE
44
360
371
45
361
    def _get_company_currency(self, cr, uid, ids, field_name, arg, context=None):
372
    def _get_company_currency(self, cr, uid, ids, field_name, arg, context=None):
46
362
        result = {}
373
        result = {}
47
@@ -490,10 +501,18 @@
48
490
            'manage this. So if you import from another software system you may have to use the rate at date. ' \
501
            'manage this. So if you import from another software system you may have to use the rate at date. ' \
49
491
            'Incoming transactions always use the rate at date.', \
502
            'Incoming transactions always use the rate at date.', \
50
492
            required=True),
503
            required=True),
51
504
<<<<<<< TREE
52
493
        'level': fields.function(_get_level, string='Level', method=True, type='integer',
505
        'level': fields.function(_get_level, string='Level', method=True, type='integer',
53
494
             store={
506
             store={
54
495
                    'account.account': (_get_children_and_consol, ['level', 'parent_id'], 10),
507
                    'account.account': (_get_children_and_consol, ['level', 'parent_id'], 10),
55
496
                   }),
508
                   }),
56
509
=======
57
510
        'level': fields.function(_get_level, string='Level', method=True, type='integer',
58
511
            store={
59
512
                'account.account': (_get_children_and_consol, ['level', 'parent_id'], 10),
60
513
            }),
61
514
62
515
>>>>>>> MERGE-SOURCE
63
497
    }
516
    }
64
498
517
65
499
    _defaults = {
518
    _defaults = {
66
@@ -779,11 +798,28 @@
67
779
        return super(account_journal, self).write(cr, uid, ids, vals, context=context)
798
        return super(account_journal, self).write(cr, uid, ids, vals, context=context)
68
780
799
69
781
    def create_sequence(self, cr, uid, vals, context=None):
800
    def create_sequence(self, cr, uid, vals, context=None):
70
801
<<<<<<< TREE
71
782
        """ Create new no_gap entry sequence for every new Joural
802
        """ Create new no_gap entry sequence for every new Joural
72
783
        """
803
        """
73
784
        # in account.journal code is actually the prefix of the sequence
804
        # in account.journal code is actually the prefix of the sequence
74
785
        # whereas ir.sequence code is a key to lookup global sequences.
805
        # whereas ir.sequence code is a key to lookup global sequences.
75
786
        prefix = vals['code'].upper()
806
        prefix = vals['code'].upper()
76
807
=======
77
808
        """
78
809
        Create new entry sequence for every new Joural
79
810
        """
80
811
        seq_pool = self.pool.get('ir.sequence')
81
812
        seq_typ_pool = self.pool.get('ir.sequence.type')
82
813
83
814
        name = vals['name']
84
815
        code = vals['code'].lower()
85
816
86
817
        types = {
87
818
            'name': name,
88
819
            'code': code
89
820
        }
90
821
        seq_typ_pool.create(cr, uid, types)
91
822
>>>>>>> MERGE-SOURCE
92
787
823
93
788
        seq = {
824
        seq = {
94
789
            'name': vals['name'],
825
            'name': vals['name'],
95
@@ -792,15 +828,25 @@
96
792
            'padding': 4,
828
            'padding': 4,
97
793
            'number_increment': 1
829
            'number_increment': 1
98
794
        }
830
        }
99
831
<<<<<<< TREE
100
795
        if 'company_id' in vals:
832
        if 'company_id' in vals:
101
796
            seq['company_id'] = vals['company_id']
833
            seq['company_id'] = vals['company_id']
102
797
        return self.pool.get('ir.sequence').create(cr, uid, seq)
834
        return self.pool.get('ir.sequence').create(cr, uid, seq)
103
835
=======
104
836
        if 'company_id' in vals:
105
837
            seq['company_id'] = vals['company_id']
106
838
        return seq_pool.create(cr, uid, seq)
107
839
>>>>>>> MERGE-SOURCE
108
798
840
109
799
    def create(self, cr, uid, vals, context=None):
841
    def create(self, cr, uid, vals, context=None):
110
800
        if not 'sequence_id' in vals or not vals['sequence_id']:
842
        if not 'sequence_id' in vals or not vals['sequence_id']:
111
843
<<<<<<< TREE
112
801
            # if we have the right to create a journal, we should be able to
844
            # if we have the right to create a journal, we should be able to
113
802
            # create it's sequence.
845
            # create it's sequence.
114
803
            vals.update({'sequence_id': self.create_sequence(cr, SUPERUSER_ID, vals, context)})
846
            vals.update({'sequence_id': self.create_sequence(cr, SUPERUSER_ID, vals, context)})
115
847
=======
116
848
            vals.update({'sequence_id': self.create_sequence(cr, 1, vals, context)})
117
849
>>>>>>> MERGE-SOURCE
118
804
        return super(account_journal, self).create(cr, uid, vals, context)
850
        return super(account_journal, self).create(cr, uid, vals, context)
119
805
851
120
806
    def name_get(self, cr, user, ids, context=None):
852
    def name_get(self, cr, user, ids, context=None):
121
@@ -841,7 +887,7 @@
122
841
        if name:
887
        if name:
123
842
            ids = self.search(cr, user, [('code', 'ilike', name)]+ args, limit=limit, context=context)
888
            ids = self.search(cr, user, [('code', 'ilike', name)]+ args, limit=limit, context=context)
124
843
        if not ids:
889
        if not ids:
126
844
            ids = self.search(cr, user, [('name', 'ilike', name)]+ args, limit=limit, context=context)#fix it ilike should be replace with operator
890
            ids = self.search(cr, user, [('name', operator, name)]+ args, limit=limit, context=context)
127
845
891
128
846
        return self.name_get(cr, user, ids, context=context)
892
        return self.name_get(cr, user, ids, context=context)
129
847
893
130
@@ -1001,6 +1047,7 @@
131
1001
    def find(self, cr, uid, dt=None, context=None):
1047
    def find(self, cr, uid, dt=None, context=None):
132
1002
        if context is None: context = {}
1048
        if context is None: context = {}
133
1003
        if not dt:
1049
        if not dt:
134
1050
<<<<<<< TREE
135
1004
            dt = fields.date.context_today(self, cr, uid, context=context)
1051
            dt = fields.date.context_today(self, cr, uid, context=context)
136
1005
        args = [('date_start', '<=' ,dt), ('date_stop', '>=', dt)]
1052
        args = [('date_start', '<=' ,dt), ('date_stop', '>=', dt)]
137
1006
        if context.get('company_id', False):
1053
        if context.get('company_id', False):
138
@@ -1017,14 +1064,36 @@
139
1017
        if not result:
1064
        if not result:
140
1018
            raise osv.except_osv(_('Error !'), _('There is no period defined for this date: %s.\nPlease create one.')%dt)
1065
            raise osv.except_osv(_('Error !'), _('There is no period defined for this date: %s.\nPlease create one.')%dt)
141
1019
        return result
1066
        return result
142
1067
=======
143
1068
            dt = time.strftime('%Y-%m-%d')
144
1069
#CHECKME: shouldn't we check the state of the period?
145
1070
        args = [('date_start', '<=' ,dt), ('date_stop', '>=', dt)]
146
1071
        if context.get('company_id', False):
147
1072
            args.append(('company_id', '=', context['company_id']))
148
1073
        else:
149
1074
            company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
150
1075
            args.append(('company_id', '=', company_id))
151
1076
        ids = self.search(cr, uid, args, context=context)
152
1077
        if not ids:
153
1078
            raise osv.except_osv(_('Error !'), _('No period defined for this date: %s !\nPlease create a fiscal year.')%dt)
154
1079
        return ids
155
1080
>>>>>>> MERGE-SOURCE
156
1020
1081
157
1021
    def action_draft(self, cr, uid, ids, *args):
1082
    def action_draft(self, cr, uid, ids, *args):
158
1022
        mode = 'draft'
1083
        mode = 'draft'
159
1084
<<<<<<< TREE
160
1023
        for period in self.browse(cr, uid, ids):
1085
        for period in self.browse(cr, uid, ids):
161
1024
            if period.fiscalyear_id.state == 'done':
1086
            if period.fiscalyear_id.state == 'done':
162
1025
                raise osv.except_osv(_('Warning !'), _('You can not re-open a period which belongs to closed fiscal year'))
1087
                raise osv.except_osv(_('Warning !'), _('You can not re-open a period which belongs to closed fiscal year'))
163
1026
        cr.execute('update account_journal_period set state=%s where period_id in %s', (mode, tuple(ids),))
1088
        cr.execute('update account_journal_period set state=%s where period_id in %s', (mode, tuple(ids),))
164
1027
        cr.execute('update account_period set state=%s where id in %s', (mode, tuple(ids),))
1089
        cr.execute('update account_period set state=%s where id in %s', (mode, tuple(ids),))
165
1090
=======
166
1091
        for period in self.browse(cr, uid, ids):
167
1092
            if period.fiscalyear_id.state == 'done':
168
1093
                raise osv.except_osv(_('Warning !'), _('You can not re-open a period which belongs to closed fiscal year'))
169
1094
        cr.execute('update account_journal_period set state=%s where period_id in %s', (mode, tuple(ids)))
170
1095
        cr.execute('update account_period set state=%s where id in %s', (mode, tuple(ids)))
171
1096
>>>>>>> MERGE-SOURCE
172
1028
        return True
1097
        return True
173
1029
1098
174
1030
    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
1099
    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
175
@@ -1284,10 +1353,38 @@
176
1284
                    return False
1353
                    return False
177
1285
        return True
1354
        return True
178
1286
1355
179
1356
<<<<<<< TREE
180
1357
=======
181
1358
    def _check_period_journal(self, cursor, user, ids, context=None):
182
1359
        for move in self.browse(cursor, user, ids, context=context):
183
1360
            for line in move.line_id:
184
1361
                if line.period_id.id != move.period_id.id:
185
1362
                    return False
186
1363
                if line.journal_id.id != move.journal_id.id:
187
1364
                    return False
188
1365
        return True
189
1366
190
1367
    def _check_date(self, cursor, user, ids, context=None):
191
1368
        for move in self.browse(cursor, user, ids, context=context):
192
1369
            if move.journal_id.allow_date:
193
1370
                if not time.strptime(move.date[:10],'%Y-%m-%d') >= time.strptime(move.period_id.date_start, '%Y-%m-%d') or not time.strptime(move.date[:10], '%Y-%m-%d') <= time.strptime(move.period_id.date_stop, '%Y-%m-%d'):
194
1371
                        return False
195
1372
        return True
196
1373
197
1374
>>>>>>> MERGE-SOURCE
198
1287
    _constraints = [
1375
    _constraints = [
199
1288
        (_check_centralisation,
1376
        (_check_centralisation,
200
1289
            'You cannot create more than one move per period on a centralized journal.',
1377
            'You cannot create more than one move per period on a centralized journal.',
201
1290
            ['journal_id']),
1378
            ['journal_id']),
202
1379
<<<<<<< TREE
203
1380
=======
204
1381
        (_check_period_journal,
205
1382
            'You cannot create entries on different periods/journals in the same move',
206
1383
            ['line_id']),
207
1384
        (_check_date,
208
1385
            'The date of your Journal Entry is not in the defined period!',
209
1386
            ['journal_id'])
210
1387
>>>>>>> MERGE-SOURCE
211
1291
    ]
1388
    ]
212
1292
1389
213
1293
    def post(self, cr, uid, ids, context=None):
1390
    def post(self, cr, uid, ids, context=None):
214
@@ -1340,8 +1437,15 @@
215
1340
1437
216
1341
    def button_cancel(self, cr, uid, ids, context=None):
1438
    def button_cancel(self, cr, uid, ids, context=None):
217
1342
        for line in self.browse(cr, uid, ids, context=context):
1439
        for line in self.browse(cr, uid, ids, context=context):
218
1440
<<<<<<< TREE
219
1343
            if not line.journal_id.update_posted:
1441
            if not line.journal_id.update_posted:
220
1344
                raise osv.except_osv(_('Error!'), _('You cannot modify a posted entry of this journal.\nFirst you should set the journal to allow cancelling entries.'))
1442
                raise osv.except_osv(_('Error!'), _('You cannot modify a posted entry of this journal.\nFirst you should set the journal to allow cancelling entries.'))
221
1443
=======
222
1444
            if line.period_id.state == 'done':
223
1445
                raise osv.except_osv(_('Error !'), _('You can not modify a posted entry of closed periods'))
224
1446
            elif not line.journal_id.update_posted:
225
1447
                raise osv.except_osv(_('Error !'), _('You can not modify a posted entry of this journal !\nYou should set the journal to allow cancelling entries if you want to do that.'))
226
1448
>>>>>>> MERGE-SOURCE
227
1345
        if ids:
1449
        if ids:
228
1346
            cr.execute('UPDATE account_move '\
1450
            cr.execute('UPDATE account_move '\
229
1347
                       'SET state=%s '\
1451
                       'SET state=%s '\
230
@@ -1393,8 +1497,7 @@
231
1393
                    if not l[0]:
1497
                    if not l[0]:
232
1394
                        l[2]['period_id'] = default_period
1498
                        l[2]['period_id'] = default_period
233
1395
                context['period_id'] = default_period
1499
                context['period_id'] = default_period
236
1396
1500
        if vals.get('line_id'):
235
1397
        if 'line_id' in vals:
237
1398
            c = context.copy()
1501
            c = context.copy()
238
1399
            c['novalidate'] = True
1502
            c['novalidate'] = True
239
1400
            c['period_id'] = vals['period_id'] if 'period_id' in vals else self._get_period(cr, uid, context)
1503
            c['period_id'] = vals['period_id'] if 'period_id' in vals else self._get_period(cr, uid, context)
240
@@ -1452,7 +1555,12 @@
241
1452
1555
242
1453
    def _centralise(self, cr, uid, move, mode, context=None):
1556
    def _centralise(self, cr, uid, move, mode, context=None):
243
1454
        assert mode in ('debit', 'credit'), 'Invalid Mode' #to prevent sql injection
1557
        assert mode in ('debit', 'credit'), 'Invalid Mode' #to prevent sql injection
245
1455
        currency_obj = self.pool.get('res.currency')
1558
<<<<<<< TREE
246
1559
        currency_obj = self.pool.get('res.currency')
247
1560
=======
248
1561
        currency_obj = self.pool.get('res.currency')
249
1562
        move_line_obj = self.pool.get('account.move.line')
250
1563
>>>>>>> MERGE-SOURCE
251
1456
        if context is None:
1564
        if context is None:
252
1457
            context = {}
1565
            context = {}
253
1458
1566
254
@@ -1479,7 +1587,7 @@
255
1479
            line_id = res[0]
1587
            line_id = res[0]
256
1480
        else:
1588
        else:
257
1481
            context.update({'journal_id': move.journal_id.id, 'period_id': move.period_id.id})
1589
            context.update({'journal_id': move.journal_id.id, 'period_id': move.period_id.id})
259
1482
            line_id = self.pool.get('account.move.line').create(cr, uid, {
1590
            line_id = move_line_obj.create(cr, uid, {
260
1483
                'name': _(mode.capitalize()+' Centralisation'),
1591
                'name': _(mode.capitalize()+' Centralisation'),
261
1484
                'centralisation': mode,
1592
                'centralisation': mode,
262
1485
                'partner_id': False,
1593
                'partner_id': False,
263
@@ -1490,7 +1598,8 @@
264
1490
                'date': move.period_id.date_stop,
1598
                'date': move.period_id.date_stop,
265
1491
                'debit': 0.0,
1599
                'debit': 0.0,
266
1492
                'credit': 0.0,
1600
                'credit': 0.0,
268
1493
            }, context)
1601
                'state': 'valid',
269
1602
            }, context, check=False)
270
1494
1603
271
1495
        # find the first line of this move with the other mode
1604
        # find the first line of this move with the other mode
272
1496
        # so that we can exclude it from our calculation
1605
        # so that we can exclude it from our calculation
273
@@ -1504,6 +1613,7 @@
274
1504
        cr.execute('SELECT SUM(%s) FROM account_move_line WHERE move_id=%%s AND id!=%%s' % (mode,), (move.id, line_id2))
1613
        cr.execute('SELECT SUM(%s) FROM account_move_line WHERE move_id=%%s AND id!=%%s' % (mode,), (move.id, line_id2))
275
1505
        result = cr.fetchone()[0] or 0.0
1614
        result = cr.fetchone()[0] or 0.0
276
1506
        cr.execute('update account_move_line set '+mode2+'=%s where id=%s', (result, line_id))
1615
        cr.execute('update account_move_line set '+mode2+'=%s where id=%s', (result, line_id))
277
1616
<<<<<<< TREE
278
1507
1617
279
1508
        #adjust also the amount in currency if needed
1618
        #adjust also the amount in currency if needed
280
1509
        cr.execute("select currency_id, sum(amount_currency) as amount_currency from account_move_line where move_id = %s and currency_id is not null group by currency_id", (move.id,))
1619
        cr.execute("select currency_id, sum(amount_currency) as amount_currency from account_move_line where move_id = %s and currency_id is not null group by currency_id", (move.id,))
281
@@ -1533,20 +1643,55 @@
282
1533
                        'amount_currency': amount_currency,
1643
                        'amount_currency': amount_currency,
283
1534
                    }, context)
1644
                    }, context)
284
1535
1645
285
1646
=======
286
1647
287
1648
        #adjust also the amount in currency if needed
288
1649
        cr.execute("select currency_id, COALESCE(sum(amount_currency),0.0) as amount_currency from account_move_line where move_id = %s and currency_id is not null group by currency_id", (move.id,))
289
1650
        for row in cr.dictfetchall():
290
1651
            currency_id = currency_obj.browse(cr, uid, row['currency_id'], context=context)
291
1652
            if not currency_obj.is_zero(cr, uid, currency_id, row['amount_currency']):
292
1653
                amount_currency = row['amount_currency'] * -1
293
1654
                account_id = amount_currency > 0 and move.journal_id.default_debit_account_id.id or move.journal_id.default_credit_account_id.id
294
1655
                cr.execute('select id from account_move_line where move_id=%s and centralisation=\'currency\' and currency_id = %s limit 1', (move.id, row['currency_id']))
295
1656
                res = cr.fetchone()
296
1657
                if res:
297
1658
                    cr.execute('update account_move_line set amount_currency=%s , account_id=%s where id=%s', (amount_currency, account_id, res[0]))
298
1659
                else:
299
1660
                    context.update({'journal_id': move.journal_id.id, 'period_id': move.period_id.id})
300
1661
                    line_id = move_line_obj.create(cr, uid, {
301
1662
                        'name': _('Currency Adjustment'),
302
1663
                        'centralisation': 'currency',
303
1664
                        'account_id': account_id,
304
1665
                        'move_id': move.id,
305
1666
                        'journal_id': move.journal_id.id,
306
1667
                        'period_id': move.period_id.id,
307
1668
                        'date': move.period_id.date_stop,
308
1669
                        'debit': 0.0,
309
1670
                        'credit': 0.0,
310
1671
                        'currency_id': row['currency_id'],
311
1672
                        'amount_currency': amount_currency,
312
1673
                    }, context)
313
1674
314
1675
>>>>>>> MERGE-SOURCE
315
1536
        return True
1676
        return True
316
1537
1677
317
1538
    #
1678
    #
318
1539
    # Validate a balanced move. If it is a centralised journal, create a move.
1679
    # Validate a balanced move. If it is a centralised journal, create a move.
319
1540
    #
1680
    #
320
1541
    def validate(self, cr, uid, ids, context=None):
1681
    def validate(self, cr, uid, ids, context=None):
321
1682
        if context is None:
322
1683
            context = {}
323
1542
        if context and ('__last_update' in context):
1684
        if context and ('__last_update' in context):
324
1543
            del context['__last_update']
1685
            del context['__last_update']
325
1544
1686
326
1545
        valid_moves = [] #Maintains a list of moves which can be responsible to create analytic entries
1687
        valid_moves = [] #Maintains a list of moves which can be responsible to create analytic entries
327
1546
        obj_analytic_line = self.pool.get('account.analytic.line')
1688
        obj_analytic_line = self.pool.get('account.analytic.line')
328
1547
        obj_move_line = self.pool.get('account.move.line')
1689
        obj_move_line = self.pool.get('account.move.line')
329
1690
330
1548
        for move in self.browse(cr, uid, ids, context):
1691
        for move in self.browse(cr, uid, ids, context):
331
1549
            # Unlink old analytic lines on move_lines
1692
            # Unlink old analytic lines on move_lines
332
1693
            if not move.line_id and not context.get('lines_cancel'):
333
1694
                raise osv.except_osv(_('No Move Lines !'), _('Please create some move lines.'))
334
1550
            for obj_line in move.line_id:
1695
            for obj_line in move.line_id:
335
1551
                for obj in obj_line.analytic_lines:
1696
                for obj in obj_line.analytic_lines:
336
1552
                    obj_analytic_line.unlink(cr,uid,obj.id)
1697
                    obj_analytic_line.unlink(cr,uid,obj.id)
337
@@ -1742,7 +1887,8 @@
338
1742
                    AND move.id = line.move_id \
1887
                    AND move.id = line.move_id \
339
1743
                    GROUP BY line.tax_code_id',
1888
                    GROUP BY line.tax_code_id',
340
1744
                       (parent_ids,) + where_params)
1889
                       (parent_ids,) + where_params)
342
1745
        res=dict(cr.fetchall())
1890
        res = dict(cr.fetchall())
343
1891
        res2 = {}
344
1746
        obj_precision = self.pool.get('decimal.precision')
1892
        obj_precision = self.pool.get('decimal.precision')
345
1747
        res2 = {}
1893
        res2 = {}
346
1748
        for record in self.browse(cr, uid, ids, context=context):
1894
        for record in self.browse(cr, uid, ids, context=context):
347
@@ -2180,6 +2326,7 @@
348
2180
                cur_price_unit -= tax.amount
2326
                cur_price_unit -= tax.amount
349
2181
2327
350
2182
        for tax in taxes:
2328
        for tax in taxes:
351
2329
            amount = 0.0
352
2183
            if tax.type=='percent':
2330
            if tax.type=='percent':
353
2184
                if tax.include_base_amount:
2331
                if tax.include_base_amount:
354
2185
                    amount = cur_price_unit - (cur_price_unit / (1 + tax.amount))
2332
                    amount = cur_price_unit - (cur_price_unit / (1 + tax.amount))
355
@@ -3094,12 +3241,21 @@
356
3094
        configured_cmp = [r[0] for r in cr.fetchall()]
3241
        configured_cmp = [r[0] for r in cr.fetchall()]
357
3095
        unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
3242
        unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
358
3096
        for field in res['fields']:
3243
        for field in res['fields']:
359
3244
<<<<<<< TREE
360
3097
            if field == 'company_id':
3245
            if field == 'company_id':
361
3098
                res['fields'][field]['domain'] = [('id','in',unconfigured_cmp)]
3246
                res['fields'][field]['domain'] = [('id','in',unconfigured_cmp)]
362
3099
                res['fields'][field]['selection'] = [('', '')]
3247
                res['fields'][field]['selection'] = [('', '')]
363
3100
                if unconfigured_cmp:
3248
                if unconfigured_cmp:
364
3101
                    cmp_select = [(line.id, line.name) for line in company_obj.browse(cr, uid, unconfigured_cmp)]
3249
                    cmp_select = [(line.id, line.name) for line in company_obj.browse(cr, uid, unconfigured_cmp)]
365
3102
                    res['fields'][field]['selection'] = cmp_select
3250
                    res['fields'][field]['selection'] = cmp_select
366
3251
=======
367
3252
           if field == 'company_id':
368
3253
               res['fields'][field]['domain'] = [('id','in',unconfigured_cmp)]
369
3254
               res['fields'][field]['selection'] = [('', '')]
370
3255
               if unconfigured_cmp:
371
3256
                   cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
372
3257
                   res['fields'][field]['selection'] = cmp_select
373
3258
>>>>>>> MERGE-SOURCE
374
3103
        return res
3259
        return res
375
3104
3260
376
3105
    def check_created_journals(self, cr, uid, vals_journal, company_id, context=None):
3261
    def check_created_journals(self, cr, uid, vals_journal, company_id, context=None):
377
@@ -3518,7 +3674,28 @@
378
3518
            default_account_id  = obj_acc.create(cr, uid, vals, context=context)
3674
            default_account_id  = obj_acc.create(cr, uid, vals, context=context)
379
3519
3675
380
3520
            #create the bank journal
3676
            #create the bank journal
381
3677
<<<<<<< TREE
382
3521
            vals_journal = self._prepare_bank_journal(cr, uid, line, current_num, default_account_id, company_id, context=context)
3678
            vals_journal = self._prepare_bank_journal(cr, uid, line, current_num, default_account_id, company_id, context=context)
383
3679
=======
384
3680
            analitical_bank_ids = analytic_journal_obj.search(cr,uid,[('type','=','situation')])
385
3681
            analitical_journal_bank = analitical_bank_ids and analitical_bank_ids[0] or False
386
3682
387
3683
            vals_journal = {}
388
3684
            vals_journal['name']= vals['name']
389
3685
            vals_journal['code']= _('BNK') + str(current_num)
390
3686
            vals_journal['sequence_id'] = seq_id
391
3687
            vals_journal['type'] = line.account_type == 'cash' and 'cash' or 'bank'
392
3688
            vals_journal['company_id'] =  company_id
393
3689
            vals_journal['analytic_journal_id'] = analitical_journal_bank
394
3690
395
3691
            if line.currency_id:
396
3692
                vals_journal['view_id'] = view_id_cur
397
3693
                vals_journal['currency'] = line.currency_id.id
398
3694
            else:
399
3695
                vals_journal['view_id'] = view_id_cash
400
3696
            vals_journal['default_credit_account_id'] = acc_cash_id
401
3697
            vals_journal['default_debit_account_id'] = acc_cash_id
402
3698
>>>>>>> MERGE-SOURCE
403
3522
            obj_journal.create(cr, uid, vals_journal)
3699
            obj_journal.create(cr, uid, vals_journal)
404
3523
            current_num += 1
3700
            current_num += 1
405
3524
        return True
3701
        return True
406
3525
3702
407
=== modified file 'account/account_analytic_line.py'
408
--- account/account_analytic_line.py	2013-04-15 10:23:49 +0000
409
+++ account/account_analytic_line.py	2013-06-03 06:13:34 +0000
410
@@ -64,13 +64,13 @@
411
64
    # property_valuation_price_type property
64
    # property_valuation_price_type property
412
65
    def on_change_unit_amount(self, cr, uid, id, prod_id, quantity, company_id,
65
    def on_change_unit_amount(self, cr, uid, id, prod_id, quantity, company_id,
413
66
            unit=False, journal_id=False, context=None):
66
            unit=False, journal_id=False, context=None):
416
67
        if context==None:
67
        if context is None:
417
68
            context={}
68
            context = {}
418
69
        if not journal_id:
69
        if not journal_id:
419
70
            j_ids = self.pool.get('account.analytic.journal').search(cr, uid, [('type','=','purchase')])
70
            j_ids = self.pool.get('account.analytic.journal').search(cr, uid, [('type','=','purchase')])
420
71
            journal_id = j_ids and j_ids[0] or False
71
            journal_id = j_ids and j_ids[0] or False
421
72
        if not journal_id or not prod_id:
72
        if not journal_id or not prod_id:
423
73
            return {}
73
            return {'value': {}}
424
74
        product_obj = self.pool.get('product.product')
74
        product_obj = self.pool.get('product.product')
425
75
        analytic_journal_obj =self.pool.get('account.analytic.journal')
75
        analytic_journal_obj =self.pool.get('account.analytic.journal')
426
76
        product_price_type_obj = self.pool.get('product.price.type')
76
        product_price_type_obj = self.pool.get('product.price.type')
427
77
77
428
=== modified file 'account/account_assert_test.xml'
429
--- account/account_assert_test.xml	2011-01-14 00:11:01 +0000
430
+++ account/account_assert_test.xml	2013-06-03 06:13:34 +0000
431
@@ -2,7 +2,7 @@
432
2
<openerp>
2
<openerp>
433
3
    <data>
3
    <data>
434
4
        <assert model="account.move" search="[]" string="For all Journal Items, the state is valid implies that the sum of credits equals the sum of debits">
4
        <assert model="account.move" search="[]" string="For all Journal Items, the state is valid implies that the sum of credits equals the sum of debits">
436
5
            <test expr="not len(line_id) or line_id[0].state != 'valid' or (sum([l.debit - l.credit for l in line_id]) &lt;= 0.00001)"/>
5
            <test expr="not len(line_id) or line_id[0].state != 'valid' or abs(sum([l.debit - l.credit for l in line_id]) &lt;= 0.00001)"/>
437
6
        </assert>
6
        </assert>
438
7
    </data>
7
    </data>
439
8
</openerp>
8
</openerp>
440
9
9
441
=== modified file 'account/account_bank_statement.py'
442
--- account/account_bank_statement.py	2013-04-18 10:39:07 +0000
443
+++ account/account_bank_statement.py	2013-06-03 06:13:34 +0000
444
@@ -367,8 +367,8 @@
445
367
                raise osv.except_osv(_('Error!'),
367
                raise osv.except_osv(_('Error!'),
446
368
                        _('Journal item "%s" is not valid.') % line.name)
368
                        _('Journal item "%s" is not valid.') % line.name)
447
369
369
450
370
        # Bank statements will not consider boolean on journal entry_posted
370
        if st.journal_id.entry_posted:
451
371
        account_move_obj.post(cr, uid, [move_id], context=context)
371
            account_move_obj.post(cr, uid, [move_id], context=context)
452
372
        return move_id
372
        return move_id
453
373
373
454
374
    def get_next_st_line_number(self, cr, uid, st_number, st_line, context=None):
374
    def get_next_st_line_number(self, cr, uid, st_number, st_line, context=None):
455
@@ -571,7 +571,11 @@
456
571
    }
571
    }
457
572
    _defaults = {
572
    _defaults = {
458
573
        'name': lambda self,cr,uid,context={}: self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement.line'),
573
        'name': lambda self,cr,uid,context={}: self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement.line'),
459
574
<<<<<<< TREE
460
574
        'date': lambda self,cr,uid,context={}: context.get('date', fields.date.context_today(self,cr,uid,context=context)),
575
        'date': lambda self,cr,uid,context={}: context.get('date', fields.date.context_today(self,cr,uid,context=context)),
461
576
=======
462
577
        'date': lambda self, cr, uid, context, *a: context.get('date') or time.strftime('%Y-%m-%d'),
463
578
>>>>>>> MERGE-SOURCE
464
575
        'type': 'general',
579
        'type': 'general',
465
576
    }
580
    }
466
577
581
467
578
582
468
=== modified file 'account/account_invoice.py'
469
--- account/account_invoice.py	2013-05-22 10:33:05 +0000
470
+++ account/account_invoice.py	2013-06-03 06:13:34 +0000
471
@@ -79,10 +79,18 @@
472
79
79
473
80
    def _reconciled(self, cr, uid, ids, name, args, context=None):
80
    def _reconciled(self, cr, uid, ids, name, args, context=None):
474
81
        res = {}
81
        res = {}
475
82
<<<<<<< TREE
476
82
        for inv in self.browse(cr, uid, ids, context=context):
83
        for inv in self.browse(cr, uid, ids, context=context):
477
83
            res[inv.id] = self.test_paid(cr, uid, [inv.id])
84
            res[inv.id] = self.test_paid(cr, uid, [inv.id])
478
84
            if not res[inv.id] and inv.state == 'paid':
85
            if not res[inv.id] and inv.state == 'paid':
479
85
                self.signal_open_test(cr, uid, [inv.id])
86
                self.signal_open_test(cr, uid, [inv.id])
480
87
=======
481
88
        wf_service = netsvc.LocalService("workflow")
482
89
        for inv in self.browse(cr, uid, ids, context=context):
483
90
            res[inv.id] = self.test_paid(cr, uid, [inv.id])
484
91
            if not res[inv.id] and inv.state == 'paid':
485
92
                wf_service.trg_validate(uid, 'account.invoice', inv.id, 'open_test', cr)
486
93
>>>>>>> MERGE-SOURCE
487
86
        return res
94
        return res
488
87
95
489
88
    def _get_reference_type(self, cr, uid, context=None):
96
    def _get_reference_type(self, cr, uid, context=None):
490
@@ -91,13 +99,25 @@
491
91
    def _amount_residual(self, cr, uid, ids, name, args, context=None):
99
    def _amount_residual(self, cr, uid, ids, name, args, context=None):
492
92
        result = {}
100
        result = {}
493
93
        for invoice in self.browse(cr, uid, ids, context=context):
101
        for invoice in self.browse(cr, uid, ids, context=context):
494
102
            checked_partial_rec_ids = []
495
94
            result[invoice.id] = 0.0
103
            result[invoice.id] = 0.0
496
95
            if invoice.move_id:
104
            if invoice.move_id:
497
105
<<<<<<< TREE
498
96
                for m in invoice.move_id.line_id:
106
                for m in invoice.move_id.line_id:
499
97
                    if m.account_id.type in ('receivable','payable'):
107
                    if m.account_id.type in ('receivable','payable'):
500
98
                        result[invoice.id] += m.amount_residual_currency
108
                        result[invoice.id] += m.amount_residual_currency
501
99
            #prevent the residual amount on the invoice to be less than 0
109
            #prevent the residual amount on the invoice to be less than 0
502
100
            result[invoice.id] = max(result[invoice.id], 0.0)            
110
            result[invoice.id] = max(result[invoice.id], 0.0)            
503
111
=======
504
112
                for move_line in invoice.move_id.line_id:
505
113
                    if move_line.account_id.type in ('receivable','payable'):
506
114
                        if move_line.reconcile_partial_id:
507
115
                            partial_reconcile_id = move_line.reconcile_partial_id.id
508
116
                            if partial_reconcile_id in checked_partial_rec_ids:
509
117
                                continue
510
118
                            checked_partial_rec_ids.append(partial_reconcile_id)
511
119
                        result[invoice.id] += move_line.amount_residual_currency
512
120
>>>>>>> MERGE-SOURCE
513
101
        return result
121
        return result
514
102
122
515
103
    # Give Journal Items related to the payment reconciled to this invoice
123
    # Give Journal Items related to the payment reconciled to this invoice
516
@@ -264,8 +284,13 @@
517
264
        'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}, track_visibility='always'),
284
        'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}, track_visibility='always'),
518
265
        'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
285
        'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
519
266
        'company_id': fields.many2one('res.company', 'Company', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}),
286
        'company_id': fields.many2one('res.company', 'Company', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}),
520
287
<<<<<<< TREE
521
267
        'check_total': fields.float('Verification Total', digits_compute=dp.get_precision('Account'), readonly=True, states={'draft':[('readonly',False)]}),
288
        'check_total': fields.float('Verification Total', digits_compute=dp.get_precision('Account'), readonly=True, states={'draft':[('readonly',False)]}),
522
268
        'reconciled': fields.function(_reconciled, string='Paid/Reconciled', type='boolean',
289
        'reconciled': fields.function(_reconciled, string='Paid/Reconciled', type='boolean',
523
290
=======
524
291
        'check_total': fields.float('Total', digits_compute=dp.get_precision('Account'), states={'open':[('readonly',True)],'close':[('readonly',True)],'paid':[('readonly',True)]}),
525
292
        'reconciled': fields.function(_reconciled, method=True, string='Paid/Reconciled', type='boolean',
526
293
>>>>>>> MERGE-SOURCE
527
269
            store={
294
            store={
528
270
                'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 50), # Check if we can remove ?
295
                'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 50), # Check if we can remove ?
529
271
                'account.move.line': (_get_invoice_from_line, None, 50),
296
                'account.move.line': (_get_invoice_from_line, None, 50),
530
@@ -687,8 +712,12 @@
531
687
            'move_id':False,
712
            'move_id':False,
532
688
            'move_name':False,
713
            'move_name':False,
533
689
            'internal_number': False,
714
            'internal_number': False,
534
715
<<<<<<< TREE
535
690
            'period_id': False,
716
            'period_id': False,
536
691
            'sent': False,
717
            'sent': False,
537
718
=======
538
719
            'period_id': False
539
720
>>>>>>> MERGE-SOURCE
540
692
        })
721
        })
541
693
        if 'date_invoice' not in default:
722
        if 'date_invoice' not in default:
542
694
            default.update({
723
            default.update({
543
@@ -861,6 +890,8 @@
544
861
                    line2[tmp]['credit'] = (am < 0) and -am or 0.0
890
                    line2[tmp]['credit'] = (am < 0) and -am or 0.0
545
862
                    line2[tmp]['tax_amount'] += l['tax_amount']
891
                    line2[tmp]['tax_amount'] += l['tax_amount']
546
863
                    line2[tmp]['analytic_lines'] += l['analytic_lines']
892
                    line2[tmp]['analytic_lines'] += l['analytic_lines']
547
893
                    line2[tmp]['amount_currency'] += l['amount_currency']
548
894
                    line2[tmp]['quantity'] += l['quantity']
549
864
                else:
895
                else:
550
865
                    line2[tmp] = l
896
                    line2[tmp] = l
551
866
            line = []
897
            line = []
552
@@ -1164,6 +1195,7 @@
553
1164
        """
1195
        """
554
1165
        clean_lines = []
1196
        clean_lines = []
555
1166
        for line in lines:
1197
        for line in lines:
556
1198
<<<<<<< TREE
557
1167
            clean_line = {}
1199
            clean_line = {}
558
1168
            for field in line._all_columns.keys():
1200
            for field in line._all_columns.keys():
559
1169
                if line._all_columns[field].column._type == 'many2one':
1201
                if line._all_columns[field].column._type == 'many2one':
560
@@ -1192,6 +1224,21 @@
561
1192
            :param integer journal_id: account.journal from the wizard
1224
            :param integer journal_id: account.journal from the wizard
562
1193
            :return: dict of value to create() the refund
1225
            :return: dict of value to create() the refund
563
1194
        """
1226
        """
564
1227
=======
565
1228
            del line['id']
566
1229
            del line['invoice_id']
567
1230
            for field in ('company_id', 'partner_id', 'account_id', 'product_id',
568
1231
                          'uos_id', 'account_analytic_id', 'tax_code_id', 'base_code_id'):
569
1232
                line[field] = line.get(field, False) and line[field][0]
570
1233
            if 'invoice_line_tax_id' in line:
571
1234
                line['invoice_line_tax_id'] = [(6,0, line.get('invoice_line_tax_id', [])) ]
572
1235
        return map(lambda x: (0,0,x), lines)
573
1236
574
1237
    def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None):
575
1238
        invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'address_contact_id', 'address_invoice_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id', 'user_id', 'fiscal_position'])
576
1239
        obj_invoice_line = self.pool.get('account.invoice.line')
577
1240
        obj_invoice_tax = self.pool.get('account.invoice.tax')
578
1241
>>>>>>> MERGE-SOURCE
579
1195
        obj_journal = self.pool.get('account.journal')
1242
        obj_journal = self.pool.get('account.journal')
580
1196
1243
581
1197
        type_dict = {
1244
        type_dict = {
582
@@ -1238,6 +1285,7 @@
583
1238
1285
584
1239
    def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None, context=None):
1286
    def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None, context=None):
585
1240
        new_ids = []
1287
        new_ids = []
586
1288
<<<<<<< TREE
587
1241
        for invoice in self.browse(cr, uid, ids, context=context):
1289
        for invoice in self.browse(cr, uid, ids, context=context):
588
1242
            invoice = self._prepare_refund(cr, uid, invoice,
1290
            invoice = self._prepare_refund(cr, uid, invoice,
589
1243
                                                date=date,
1291
                                                date=date,
590
@@ -1245,6 +1293,55 @@
591
1245
                                                description=description,
1293
                                                description=description,
592
1246
                                                journal_id=journal_id,
1294
                                                journal_id=journal_id,
593
1247
                                                context=context)
1295
                                                context=context)
594
1296
=======
595
1297
        for invoice in invoices:
596
1298
            del invoice['id']
597
1299
598
1300
            type_dict = {
599
1301
                'out_invoice': 'out_refund', # Customer Invoice
600
1302
                'in_invoice': 'in_refund',   # Supplier Invoice
601
1303
                'out_refund': 'out_invoice', # Customer Refund
602
1304
                'in_refund': 'in_invoice',   # Supplier Refund
603
1305
            }
604
1306
605
1307
            invoice_lines = obj_invoice_line.read(cr, uid, invoice['invoice_line'])
606
1308
            invoice_lines = self._refund_cleanup_lines(cr, uid, invoice_lines)
607
1309
608
1310
            tax_lines = obj_invoice_tax.read(cr, uid, invoice['tax_line'])
609
1311
            tax_lines = filter(lambda l: l['manual'], tax_lines)
610
1312
            tax_lines = self._refund_cleanup_lines(cr, uid, tax_lines)
611
1313
            if journal_id:
612
1314
                refund_journal_ids = [journal_id]
613
1315
            elif invoice['type'] == 'in_invoice':
614
1316
                refund_journal_ids = obj_journal.search(cr, uid, [('type','=','purchase_refund')])
615
1317
            else:
616
1318
                refund_journal_ids = obj_journal.search(cr, uid, [('type','=','sale_refund')])
617
1319
618
1320
            if not date:
619
1321
                date = time.strftime('%Y-%m-%d')
620
1322
            invoice.update({
621
1323
                'type': type_dict[invoice['type']],
622
1324
                'date_invoice': date,
623
1325
                'state': 'draft',
624
1326
                'number': False,
625
1327
                'invoice_line': invoice_lines,
626
1328
                'tax_line': tax_lines,
627
1329
                'journal_id': refund_journal_ids
628
1330
            })
629
1331
            if period_id:
630
1332
                invoice.update({
631
1333
                    'period_id': period_id,
632
1334
                })
633
1335
            if description:
634
1336
                invoice.update({
635
1337
                    'name': description,
636
1338
                })
637
1339
            # take the id part of the tuple returned for many2one fields
638
1340
            for field in ('address_contact_id', 'address_invoice_id', 'partner_id',
639
1341
                    'account_id', 'currency_id', 'payment_term', 'journal_id',
640
1342
                    'user_id', 'fiscal_position'):
641
1343
                invoice[field] = invoice[field] and invoice[field][0]
642
1344
>>>>>>> MERGE-SOURCE
643
1248
            # create the new invoice
1345
            # create the new invoice
644
1249
            new_ids.append(self.create(cr, uid, invoice, context=context))
1346
            new_ids.append(self.create(cr, uid, invoice, context=context))
645
1250
1347
646
@@ -1447,10 +1544,14 @@
647
1447
        if not partner_id:
1544
        if not partner_id:
648
1448
            raise osv.except_osv(_('No Partner Defined !'),_("You must first select a partner !") )
1545
            raise osv.except_osv(_('No Partner Defined !'),_("You must first select a partner !") )
649
1449
        if not product:
1546
        if not product:
650
1547
<<<<<<< TREE
651
1450
            if type in ('in_invoice', 'in_refund'):
1548
            if type in ('in_invoice', 'in_refund'):
652
1451
                return {'value': {}, 'domain':{'product_uom':[]}}
1549
                return {'value': {}, 'domain':{'product_uom':[]}}
653
1452
            else:
1550
            else:
654
1453
                return {'value': {'price_unit': 0.0}, 'domain':{'product_uom':[]}}
1551
                return {'value': {'price_unit': 0.0}, 'domain':{'product_uom':[]}}
655
1552
=======
656
1553
            return {'value': {'price_unit': 0.0, 'categ_id': False}, 'domain':{'product_uom':[]}}
657
1554
>>>>>>> MERGE-SOURCE
658
1454
        part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
1555
        part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
659
1455
        fpos_obj = self.pool.get('account.fiscal.position')
1556
        fpos_obj = self.pool.get('account.fiscal.position')
660
1456
        fpos = fposition_id and fpos_obj.browse(cr, uid, fposition_id, context=context) or False
1557
        fpos = fposition_id and fpos_obj.browse(cr, uid, fposition_id, context=context) or False
661
@@ -1754,6 +1855,7 @@
662
1754
        'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
1855
        'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
663
1755
    }
1856
    }
664
1756
1857
665
1858
<<<<<<< TREE
666
1757
    def _find_accounting_partner(self, partner):
1859
    def _find_accounting_partner(self, partner):
667
1758
        '''
1860
        '''
668
1759
        Find the partner for which the accounting entries will be created
1861
        Find the partner for which the accounting entries will be created
669
@@ -1776,5 +1878,13 @@
670
1776
            self.pool.get('account.invoice').write(cr, uid, [context['default_res_id']], {'sent': True}, context=context)
1878
            self.pool.get('account.invoice').write(cr, uid, [context['default_res_id']], {'sent': True}, context=context)
671
1777
            self.pool.get('account.invoice').message_post(cr, uid, [context['default_res_id']], body=_("Invoice sent"), context=context)
1879
            self.pool.get('account.invoice').message_post(cr, uid, [context['default_res_id']], body=_("Invoice sent"), context=context)
672
1778
        return super(mail_compose_message, self).send_mail(cr, uid, ids, context=context)
1880
        return super(mail_compose_message, self).send_mail(cr, uid, ids, context=context)
673
1881
=======
674
1882
    def copy(self, cr, uid, id, default=None, context=None):
675
1883
        default = default or {}
676
1884
        default.update({'invoice_ids' : []})
677
1885
        return super(res_partner, self).copy(cr, uid, id, default, context)
678
1886
679
1887
res_partner()
680
1888
>>>>>>> MERGE-SOURCE
681
1779
1889
682
1780
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
1890
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
683
1781
1891
684
=== modified file 'account/account_invoice_view.xml'
685
--- account/account_invoice_view.xml	2013-04-22 15:34:49 +0000
686
+++ account/account_invoice_view.xml	2013-06-03 06:13:34 +0000
687
@@ -240,11 +240,32 @@
688
240
                                        <field name="factor_tax" invisible="True"/>
240
                                        <field name="factor_tax" invisible="True"/>
689
241
                                    </tree>
241
                                    </tree>
690
242
                                </field>
242
                                </field>
691
243
<<<<<<< TREE
692
243
                            </div>
244
                            </div>
693
244
                            <div class="oe_clear">
245
                            <div class="oe_clear">
694
245
                                <label for="comment"/>
246
                                <label for="comment"/>
695
246
                            </div>
247
                            </div>
696
247
                            <field name="comment"/>
248
                            <field name="comment"/>
697
249
=======
698
250
                            </group>
699
251
                            <group col="4" colspan="2">
700
252
                                <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific"/>
701
253
                                <field name="amount_untaxed"/>
702
254
                                <label string="" colspan="2"/>
703
255
                                <field name="amount_tax"/>
704
256
                                <field name="reconciled"/>
705
257
                                <field name="amount_total"/>
706
258
                                <field name="state"/>
707
259
                                <field name="residual"/>
708
260
                                <group col="6" colspan="4">
709
261
                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
710
262
                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
711
263
                                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
712
264
                                    <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
713
265
                                    <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
714
266
                                </group>
715
267
                            </group>
716
268
>>>>>>> MERGE-SOURCE
717
248
                        </page>
269
                        </page>
718
249
                        <page string="Other Info">
270
                        <page string="Other Info">
719
250
                            <group>
271
                            <group>
720
@@ -345,6 +366,7 @@
721
345
                    </group>
366
                    </group>
722
346
                    <field name="sent" invisible="1"/>
367
                    <field name="sent" invisible="1"/>
723
347
                    <notebook colspan="4">
368
                    <notebook colspan="4">
724
369
<<<<<<< TREE
725
348
                        <page string="Invoice Lines">
370
                        <page string="Invoice Lines">
726
349
                            <field name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type}">
371
                            <field name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type}">
727
350
                                <tree string="Invoice Lines" editable="bottom">
372
                                <tree string="Invoice Lines" editable="bottom">
728
@@ -387,6 +409,47 @@
729
387
                                <label for="comment"/>
409
                                <label for="comment"/>
730
388
                            </div>
410
                            </div>
731
389
                            <field name="comment" class="oe_inline" placeholder="Additional notes..."/>
411
                            <field name="comment" class="oe_inline" placeholder="Additional notes..."/>
732
412
=======
733
413
                        <page string="Invoice">
734
414
                            <field domain="[('company_id', '=', company_id),('type','=', 'receivable')]" name="account_id" groups="account.group_account_user"/>
735
415
                            <field name="name"/>
736
416
                            <field name="payment_term" widget="selection"/>
737
417
                            <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list"/>
738
418
                            <group col="1" colspan="2">
739
419
                                <field name="tax_line" nolabel="1">
740
420
                                    <tree editable="bottom" string="Taxes">
741
421
                                        <field name="name"/>
742
422
                                        <field name="account_id" groups="account.group_account_invoice"/>
743
423
                                        <field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
744
424
                                        <field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>
745
425
                                        <field invisible="True" name="base_amount"/>
746
426
                                        <field invisible="True" name="tax_amount"/>
747
427
                                        <field name="factor_base" invisible="True"/>
748
428
                                        <field name="factor_tax" invisible="True"/>
749
429
                                    </tree>
750
430
                                </field>
751
431
                            </group>
752
432
                            <group col="4" colspan="2">
753
433
                                <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" groups="base.group_user" icon="terp-stock_format-scientific"/>
754
434
                                <field name="amount_untaxed"/>
755
435
                                <label string="" colspan="2"/>
756
436
                                <field name="amount_tax"/>
757
437
                                <field name="reconciled"/>
758
438
                                <field name="amount_total"/>
759
439
                                <field name="state"/>
760
440
                                <field name="residual"/>
761
441
                                <group col="8" colspan="4" groups="base.group_user">
762
442
                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
763
443
                                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
764
444
765
445
                                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
766
446
                                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
767
447
                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
768
448
                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
769
449
                                    <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
770
450
                                </group>
771
451
                            </group>
772
452
>>>>>>> MERGE-SOURCE
773
390
                        </page>
453
                        </page>
774
391
                        <page string="Other Info">
454
                        <page string="Other Info">
775
392
                            <group col="4">
455
                            <group col="4">
776
@@ -625,11 +688,20 @@
777
625
        </record>
688
        </record>
778
626
        <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
689
        <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
779
627
690
780
691
<<<<<<< TREE
781
692
=======
782
693
        <act_window context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
783
694
784
695
>>>>>>> MERGE-SOURCE
785
628
        <act_window
696
        <act_window
786
629
           id="act_account_journal_2_account_invoice_opened"
697
           id="act_account_journal_2_account_invoice_opened"
787
630
           name="Unpaid Invoices"
698
           name="Unpaid Invoices"
788
699
<<<<<<< TREE
789
631
           context="{'search_default_journal_id': [active_id], 'search_default_unpaid':1, 'default_journal_id': active_id}"
700
           context="{'search_default_journal_id': [active_id], 'search_default_unpaid':1, 'default_journal_id': active_id}"
790
632
           domain="[('journal_id','=', active_id)]"
701
           domain="[('journal_id','=', active_id)]"
791
702
=======
792
703
           context="{'search_default_journal_id': active_id, 'search_default_unpaid':1, 'default_journal_id': active_id}"
793
704
>>>>>>> MERGE-SOURCE
794
633
           res_model="account.invoice"
705
           res_model="account.invoice"
795
634
           src_model="account.journal"/>
706
           src_model="account.journal"/>
796
635
707
797
636
708
798
=== modified file 'account/account_move_line.py'
799
--- account/account_move_line.py	2013-04-29 15:14:10 +0000
800
+++ account/account_move_line.py	2013-06-03 06:13:34 +0000
801
@@ -242,6 +242,7 @@
802
242
242
803
243
        # Compute simple values
243
        # Compute simple values
804
244
        data = super(account_move_line, self).default_get(cr, uid, fields, context=context)
244
        data = super(account_move_line, self).default_get(cr, uid, fields, context=context)
805
245
<<<<<<< TREE
806
245
        if context.get('journal_id'):
246
        if context.get('journal_id'):
807
246
            total = 0.0
247
            total = 0.0
808
247
            #in account.move form view, it is not possible to compute total debit and credit using
248
            #in account.move form view, it is not possible to compute total debit and credit using
809
@@ -298,6 +299,138 @@
810
298
                    compute_ctx.update({'date': data['date']})
299
                    compute_ctx.update({'date': data['date']})
811
299
                data['amount_currency'] = currency_obj.compute(cr, uid, account.company_id.currency_id.id, data['currency_id'], -total, context=compute_ctx)
300
                data['amount_currency'] = currency_obj.compute(cr, uid, account.company_id.currency_id.id, data['currency_id'], -total, context=compute_ctx)
812
300
        data = self._default_get_move_form_hook(cr, uid, data)
301
        data = self._default_get_move_form_hook(cr, uid, data)
813
302
=======
814
303
        # Starts: Manual entry from account.move form
815
304
        if context.get('lines',[]):
816
305
            total_new = 0.00
817
306
            for line_record in context['lines']:
818
307
                if not isinstance(line_record, (tuple, list)):
819
308
                    line_record_detail = self.read(cr, uid, line_record, ['analytic_account_id','debit','credit','name','reconcile_id','tax_code_id','tax_amount','account_id','ref','currency_id','date_maturity','amount_currency','partner_id', 'reconcile_partial_id'])
820
309
                else:
821
310
                    line_record_detail = line_record[2]
822
311
                total_new += (line_record_detail['debit'] or 0.00)- (line_record_detail['credit'] or 0.00)
823
312
                for item in line_record_detail.keys():
824
313
                    data[item] = line_record_detail[item]
825
314
            if context['journal']:
826
315
                journal_data = journal_obj.browse(cr, uid, context['journal'], context=context)
827
316
                if journal_data.type == 'purchase':
828
317
                    if total_new > 0:
829
318
                        account = journal_data.default_credit_account_id
830
319
                    else:
831
320
                        account = journal_data.default_debit_account_id
832
321
                else:
833
322
                    if total_new > 0:
834
323
                        account = journal_data.default_credit_account_id
835
324
                    else:
836
325
                        account = journal_data.default_debit_account_id
837
326
                if account and ((not fields) or ('debit' in fields) or ('credit' in fields)) and 'partner_id' in data and (data['partner_id']):
838
327
                    part = partner_obj.browse(cr, uid, data['partner_id'], context=context)
839
328
                    account = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, account.id)
840
329
                    account = account_obj.browse(cr, uid, account, context=context)
841
330
                    data['account_id'] =  account.id
842
331
843
332
            s = -total_new
844
333
            data['debit'] = s > 0 and s or 0.0
845
334
            data['credit'] = s < 0 and -s or 0.0
846
335
            data = self._default_get_move_form_hook(cr, uid, data)
847
336
            return data
848
337
        # Ends: Manual entry from account.move form
849
338
        if not 'move_id' in fields: #we are not in manual entry
850
339
            return data
851
340
        # Compute the current move
852
341
        move_id = False
853
342
        partner_id = False
854
343
        if context.get('journal_id', False) and context.get('period_id', False):
855
344
            if 'move_id' in fields:
856
345
                cr.execute('SELECT move_id \
857
346
                    FROM \
858
347
                        account_move_line \
859
348
                    WHERE \
860
349
                        journal_id = %s and period_id = %s AND create_uid = %s AND state = %s \
861
350
                    ORDER BY id DESC limit 1',
862
351
                    (context['journal_id'], context['period_id'], uid, 'draft'))
863
352
                res = cr.fetchone()
864
353
                move_id = (res and res[0]) or False
865
354
                if not move_id:
866
355
                    return data
867
356
                else:
868
357
                    data['move_id'] = move_id
869
358
            if 'date' in fields:
870
359
                cr.execute('SELECT date \
871
360
                    FROM \
872
361
                        account_move_line \
873
362
                    WHERE \
874
363
                        journal_id = %s AND period_id = %s AND create_uid = %s \
875
364
                    ORDER BY id DESC',
876
365
                    (context['journal_id'], context['period_id'], uid))
877
366
                res = cr.fetchone()
878
367
                if res:
879
368
                    data['date'] = res[0]
880
369
                else:
881
370
                    period = period_obj.browse(cr, uid, context['period_id'],
882
371
                            context=context)
883
372
                    data['date'] = period.date_start
884
373
        if not move_id:
885
374
            return data
886
375
        total = 0
887
376
        ref_id = False
888
377
        move = move_obj.browse(cr, uid, move_id, context=context)
889
378
        if 'name' in fields:
890
379
            data.setdefault('name', move.line_id[-1].name)
891
380
        acc1 = False
892
381
        for l in move.line_id:
893
382
            acc1 = l.account_id
894
383
            partner_id = partner_id or l.partner_id.id
895
384
            ref_id = ref_id or l.ref
896
385
            total += (l.debit or 0.0) - (l.credit or 0.0)
897
386
898
387
        if 'ref' in fields:
899
388
            data['ref'] = ref_id
900
389
        if 'partner_id' in fields:
901
390
            data['partner_id'] = partner_id
902
391
903
392
        if move.journal_id.type == 'purchase':
904
393
            if total > 0:
905
394
                account = move.journal_id.default_credit_account_id
906
395
            else:
907
396
                account = move.journal_id.default_debit_account_id
908
397
        else:
909
398
            if total > 0:
910
399
                account = move.journal_id.default_credit_account_id
911
400
            else:
912
401
                account = move.journal_id.default_debit_account_id
913
402
        part = partner_id and partner_obj.browse(cr, uid, partner_id) or False
914
403
        # part = False is acceptable for fiscal position.
915
404
        account = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, account.id)
916
405
        if account:
917
406
            account = account_obj.browse(cr, uid, account, context=context)
918
407
919
408
        if account and ((not fields) or ('debit' in fields) or ('credit' in fields)):
920
409
            data['account_id'] = account.id
921
410
            # Propose the price VAT excluded, the VAT will be added when confirming line
922
411
            if account.tax_ids:
923
412
                taxes = fiscal_pos_obj.map_tax(cr, uid, part and part.property_account_position or False, account.tax_ids)
924
413
                tax = tax_obj.browse(cr, uid, taxes)
925
414
                for t in tax_obj.compute_inv(cr, uid, tax, total, 1):
926
415
                    total -= t['amount']
927
416
928
417
        s = -total
929
418
        data['debit'] = s > 0  and s or 0.0
930
419
        data['credit'] = s < 0  and -s or 0.0
931
420
932
421
        if account and account.currency_id:
933
422
            data['currency_id'] = account.currency_id.id
934
423
            acc = account
935
424
            if s>0:
936
425
                acc = acc1
937
426
            compute_ctx = context.copy()
938
427
            compute_ctx.update({
939
428
                    'res.currency.compute.account': acc,
940
429
                    'res.currency.compute.account_invert': True,
941
430
                })
942
431
            v = currency_obj.compute(cr, uid, account.company_id.currency_id.id, data['currency_id'], s, context=compute_ctx)
943
432
            data['amount_currency'] = v
944
433
>>>>>>> MERGE-SOURCE
945
301
        return data
434
        return data
946
302
435
947
303
    def on_create_write(self, cr, uid, id, context=None):
436
    def on_create_write(self, cr, uid, id, context=None):
948
@@ -465,9 +598,16 @@
949
465
                                }),
598
                                }),
950
466
        'date_created': fields.date('Creation date', select=True),
599
        'date_created': fields.date('Creation date', select=True),
951
467
        'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'),
600
        'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'),
952
601
<<<<<<< TREE
953
468
        'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation'),('currency','Currency Adjustment')], 'Centralisation', size=8),
602
        'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation'),('currency','Currency Adjustment')], 'Centralisation', size=8),
954
469
        'balance': fields.function(_balance, fnct_search=_balance_search, string='Balance'),
603
        'balance': fields.function(_balance, fnct_search=_balance_search, string='Balance'),
955
470
        'state': fields.selection([('draft','Unbalanced'), ('valid','Balanced')], 'Status', readonly=True),
604
        'state': fields.selection([('draft','Unbalanced'), ('valid','Balanced')], 'Status', readonly=True),
956
605
=======
957
606
        'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation'),('currency','Currency Adjustment')], 'Centralisation', size=8),
958
607
        'balance': fields.function(_balance, fnct_search=_balance_search, method=True, string='Balance'),
959
608
        'state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State', readonly=True,
960
609
                                  help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'),
961
610
>>>>>>> MERGE-SOURCE
962
471
        'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or a tax code account."),
611
        'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or a tax code account."),
963
472
        'tax_amount': fields.float('Tax/Base Amount', digits_compute=dp.get_precision('Account'), select=True, help="If the Tax account is a tax code account, this field will contain the taxed amount.If the tax account is base tax code, "\
612
        'tax_amount': fields.float('Tax/Base Amount', digits_compute=dp.get_precision('Account'), select=True, help="If the Tax account is a tax code account, this field will contain the taxed amount.If the tax account is base tax code, "\
964
473
                    "this field will contain the basic amount(without tax)."),
613
                    "this field will contain the basic amount(without tax)."),
965
@@ -544,10 +684,14 @@
966
544
        'date_created': fields.date.context_today,
684
        'date_created': fields.date.context_today,
967
545
        'state': 'draft',
685
        'state': 'draft',
968
546
        'currency_id': _get_currency,
686
        'currency_id': _get_currency,
969
687
<<<<<<< TREE
970
547
        'journal_id': _get_journal,
688
        'journal_id': _get_journal,
971
548
        'credit': 0.0,
689
        'credit': 0.0,
972
549
        'debit': 0.0,
690
        'debit': 0.0,
973
550
        'amount_currency': 0.0,
691
        'amount_currency': 0.0,
974
692
=======
975
693
        'journal_id': lambda self, cr, uid, c: c.get('journal_id', c.get('journal',False)),
976
694
>>>>>>> MERGE-SOURCE
977
551
        'account_id': lambda self, cr, uid, c: c.get('account_id', False),
695
        'account_id': lambda self, cr, uid, c: c.get('account_id', False),
978
552
        'period_id': _get_period,
696
        'period_id': _get_period,
979
553
        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.move.line', context=c)
697
        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.move.line', context=c)
980
@@ -585,6 +729,13 @@
981
585
            if l.company_id != l.account_id.company_id or l.company_id != l.period_id.company_id:
729
            if l.company_id != l.account_id.company_id or l.company_id != l.period_id.company_id:
982
586
                return False
730
                return False
983
587
        return True
731
        return True
984
732
    
985
733
    def _check_date(self, cr, uid, ids, context=None):
986
734
        for line in self.browse(cr, uid, ids, context=context):
987
735
            if line.journal_id.allow_date:
988
736
                if not time.strptime(line.date[:10],'%Y-%m-%d') >= time.strptime(line.period_id.date_start, '%Y-%m-%d') or not time.strptime(line.date[:10], '%Y-%m-%d') <= time.strptime(line.period_id.date_stop, '%Y-%m-%d'):
989
737
                    return False
990
738
        return True
991
588
739
992
589
    def _check_date(self, cr, uid, ids, context=None):
740
    def _check_date(self, cr, uid, ids, context=None):
993
590
        for l in self.browse(cr, uid, ids, context=context):
741
        for l in self.browse(cr, uid, ids, context=context):
994
@@ -620,6 +771,7 @@
995
620
        return True
771
        return True
996
621
772
997
622
    _constraints = [
773
    _constraints = [
998
774
<<<<<<< TREE
999
623
        (_check_no_view, 'You cannot create journal items on an account of type view.', ['account_id']),
775
        (_check_no_view, 'You cannot create journal items on an account of type view.', ['account_id']),
1000
624
        (_check_no_closed, 'You cannot create journal items on closed account.', ['account_id']),
776
        (_check_no_closed, 'You cannot create journal items on closed account.', ['account_id']),
1001
625
        (_check_company_id, 'Account and Period must belong to the same company.', ['company_id']),
777
        (_check_company_id, 'Account and Period must belong to the same company.', ['company_id']),
1002
@@ -628,6 +780,12 @@
1003
628
        (_check_currency_and_amount, "You cannot create journal items with a secondary currency without recording both 'currency' and 'amount currency' field.", ['currency_id','amount_currency']),
780
        (_check_currency_and_amount, "You cannot create journal items with a secondary currency without recording both 'currency' and 'amount currency' field.", ['currency_id','amount_currency']),
1004
629
        (_check_currency_amount, 'The amount expressed in the secondary currency must be positive when the journal item is a debit and negative when if it is a credit.', ['amount_currency']),
781
        (_check_currency_amount, 'The amount expressed in the secondary currency must be positive when the journal item is a debit and negative when if it is a credit.', ['amount_currency']),
1005
630
        (_check_currency_company, "You cannot provide a secondary currency if it is the same than the company one." , ['currency_id']),
782
        (_check_currency_company, "You cannot provide a secondary currency if it is the same than the company one." , ['currency_id']),
1006
783
=======
1007
784
        (_check_no_view, 'You can not create move line on view account.', ['account_id']),
1008
785
        (_check_no_closed, 'You can not create move line on closed account.', ['account_id']),
1009
786
        (_check_company_id, 'Company must be same for its related account and period.',['company_id'] ),
1010
787
        (_check_date, 'The date of your Journal Entry is not in the defined period!', ['date']),
1011
788
>>>>>>> MERGE-SOURCE
1012
631
    ]
789
    ]
1013
632
790
1014
633
    #TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id
791
    #TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id
1015
@@ -722,6 +880,12 @@
1016
722
    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
880
    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
1017
723
        if context is None:
881
        if context is None:
1018
724
            context = {}
882
            context = {}
1019
883
        if context and context.get('fiscalyear', False):
1020
884
            periods = self.pool.get('account.fiscalyear').browse(cr, uid, context.get('fiscalyear'), context=context).period_ids
1021
885
            period_ids = [period.id for period in periods]
1022
886
            args.append(('period_id', 'in', period_ids))
1023
887
        if context and context.get('periods', False):
1024
888
            args.append(('period_id', 'in', context.get('periods')))
1025
725
        if context and context.get('next_partner_only', False):
889
        if context and context.get('next_partner_only', False):
1026
726
            if not context.get('partner_id', False):
890
            if not context.get('partner_id', False):
1027
727
                partner = self.list_partners_to_reconcile(cr, uid, context=context)
891
                partner = self.list_partners_to_reconcile(cr, uid, context=context)
1028
@@ -777,7 +941,11 @@
1029
777
            else:
941
            else:
1030
778
                currency_id = line.company_id.currency_id
942
                currency_id = line.company_id.currency_id
1031
779
            if line.reconcile_id:
943
            if line.reconcile_id:
1032
944
<<<<<<< TREE
1033
780
                raise osv.except_osv(_('Warning'), _("Journal Item '%s' (id: %s), Move '%s' is already reconciled!") % (line.name, line.id, line.move_id.name)) 
945
                raise osv.except_osv(_('Warning'), _("Journal Item '%s' (id: %s), Move '%s' is already reconciled!") % (line.name, line.id, line.move_id.name)) 
1034
946
=======
1035
947
                raise osv.except_osv(_('Warning'), _("Journal Item '%s' (id: %s), Move '%s' is already reconciled!") % (line.name, line.id, line.move_id.name))
1036
948
>>>>>>> MERGE-SOURCE
1037
781
            if line.reconcile_partial_id:
949
            if line.reconcile_partial_id:
1038
782
                for line2 in line.reconcile_partial_id.line_partial_ids:
950
                for line2 in line.reconcile_partial_id.line_partial_ids:
1039
783
                    if not line2.reconcile_id:
951
                    if not line2.reconcile_id:
1040
@@ -853,6 +1021,7 @@
1041
853
        if r[0][1] != None:
1021
        if r[0][1] != None:
1042
854
            raise osv.except_osv(_('Error!'), _('Some entries are already reconciled.'))
1022
            raise osv.except_osv(_('Error!'), _('Some entries are already reconciled.'))
1043
855
1023
1044
1024
<<<<<<< TREE
1045
856
        if context.get('fy_closing'):
1025
        if context.get('fy_closing'):
1046
857
            # We don't want to generate any write-off when being called from the
1026
            # We don't want to generate any write-off when being called from the
1047
858
            # wizard used to close a fiscal year (and it doesn't give us any
1027
            # wizard used to close a fiscal year (and it doesn't give us any
1048
@@ -860,6 +1029,10 @@
1049
860
            pass
1029
            pass
1050
861
        elif (not currency_obj.is_zero(cr, uid, account.company_id.currency_id, writeoff)) or \
1030
        elif (not currency_obj.is_zero(cr, uid, account.company_id.currency_id, writeoff)) or \
1051
862
           (account.currency_id and (not currency_obj.is_zero(cr, uid, account.currency_id, currency))):
1031
           (account.currency_id and (not currency_obj.is_zero(cr, uid, account.currency_id, currency))):
1052
1032
=======
1053
1033
        if (not currency_obj.is_zero(cr, uid, account.company_id.currency_id, writeoff)) or \
1054
1034
           (not context.get('fy_closing', False) and account.currency_id and (not currency_obj.is_zero(cr, uid, account.currency_id, currency))):
1055
1035
>>>>>>> MERGE-SOURCE
1056
863
            if not writeoff_acc_id:
1036
            if not writeoff_acc_id:
1057
864
                raise osv.except_osv(_('Warning!'), _('You have to provide an account for the write off/exchange difference entry.'))
1037
                raise osv.except_osv(_('Warning!'), _('You have to provide an account for the write off/exchange difference entry.'))
1058
865
            if writeoff > 0:
1038
            if writeoff > 0:
1059
@@ -993,6 +1166,126 @@
1060
993
            'context':context,
1166
            'context':context,
1061
994
        }
1167
        }
1062
995
1168
1063
1169
<<<<<<< TREE
1064
1170
=======
1065
1171
    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
1066
1172
        journal_pool = self.pool.get('account.journal')
1067
1173
        if context is None:
1068
1174
            context = {}
1069
1175
        result = super(account_move_line, self).fields_view_get(cr, uid, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
1070
1176
        if view_type != 'tree':
1071
1177
            #Remove the toolbar from the form view
1072
1178
            if view_type == 'form':
1073
1179
                if result.get('toolbar', False):
1074
1180
                    result['toolbar']['action'] = []
1075
1181
            #Restrict the list of journal view in search view
1076
1182
            if view_type == 'search' and result['fields'].get('journal_id', False):
1077
1183
                result['fields']['journal_id']['selection'] = journal_pool.name_search(cr, uid, '', [], context=context)
1078
1184
                ctx = context.copy()
1079
1185
                #we add the refunds journal in the selection field of journal
1080
1186
                if context.get('journal_type', False) == 'sale':
1081
1187
                    ctx.update({'journal_type': 'sale_refund'})
1082
1188
                    result['fields']['journal_id']['selection'] += journal_pool.name_search(cr, uid, '', [], context=ctx)
1083
1189
                elif context.get('journal_type', False) == 'purchase':
1084
1190
                    ctx.update({'journal_type': 'purchase_refund'})
1085
1191
                    result['fields']['journal_id']['selection'] += journal_pool.name_search(cr, uid, '', [], context=ctx)
1086
1192
            return result
1087
1193
        if context.get('view_mode', False):
1088
1194
            return result
1089
1195
        fld = []
1090
1196
        fields = {}
1091
1197
        flds = []
1092
1198
        title = _("Accounting Entries") #self.view_header_get(cr, uid, view_id, view_type, context)
1093
1199
        xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="on_create_write" colors="red:state==\'draft\';black:state==\'valid\'">\n\t''' % (title)
1094
1200
1095
1201
        ids = journal_pool.search(cr, uid, [])
1096
1202
        journals = journal_pool.browse(cr, uid, ids, context=context)
1097
1203
        all_journal = [None]
1098
1204
        common_fields = {}
1099
1205
        total = len(journals)
1100
1206
        for journal in journals:
1101
1207
            all_journal.append(journal.id)
1102
1208
            for field in journal.view_id.columns_id:
1103
1209
                if not field.field in fields:
1104
1210
                    fields[field.field] = [journal.id]
1105
1211
                    fld.append((field.field, field.sequence, field.name))
1106
1212
                    flds.append(field.field)
1107
1213
                    common_fields[field.field] = 1
1108
1214
                else:
1109
1215
                    fields.get(field.field).append(journal.id)
1110
1216
                    common_fields[field.field] = common_fields[field.field] + 1
1111
1217
        fld.append(('period_id', 3, _('Period')))
1112
1218
        fld.append(('journal_id', 10, _('Journal')))
1113
1219
        flds.append('period_id')
1114
1220
        flds.append('journal_id')
1115
1221
        fields['period_id'] = all_journal
1116
1222
        fields['journal_id'] = all_journal
1117
1223
        fld = sorted(fld, key=itemgetter(1))
1118
1224
        widths = {
1119
1225
            'statement_id': 50,
1120
1226
            'state': 60,
1121
1227
            'tax_code_id': 50,
1122
1228
            'move_id': 40,
1123
1229
        }
1124
1230
        for field_it in fld:
1125
1231
            field = field_it[0]
1126
1232
            if common_fields.get(field) == total:
1127
1233
                fields.get(field).append(None)
1128
1234
#            if field=='state':
1129
1235
#                state = 'colors="red:state==\'draft\'"'
1130
1236
            attrs = []
1131
1237
            if field == 'debit':
1132
1238
                attrs.append('sum = "%s"' % _("Total debit"))
1133
1239
1134
1240
            elif field == 'credit':
1135
1241
                attrs.append('sum = "%s"' % _("Total credit"))
1136
1242
1137
1243
            elif field == 'move_id':
1138
1244
                attrs.append('required = "False"')
1139
1245
1140
1246
            elif field == 'account_tax_id':
1141
1247
                attrs.append('domain="[(\'parent_id\', \'=\' ,False)]"')
1142
1248
                attrs.append("context=\"{'journal_id': journal_id}\"")
1143
1249
1144
1250
            elif field == 'account_id' and journal.id:
1145
1251
                attrs.append('domain="[(\'journal_id\', \'=\', journal_id),(\'type\',\'&lt;&gt;\',\'view\'), (\'type\',\'&lt;&gt;\',\'closed\')]" on_change="onchange_account_id(account_id, partner_id)"')
1146
1252
1147
1253
            elif field == 'partner_id':
1148
1254
                attrs.append('on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"')
1149
1255
1150
1256
            elif field == 'journal_id':
1151
1257
                attrs.append("context=\"{'journal_id': journal_id}\"")
1152
1258
1153
1259
            elif field == 'statement_id':
1154
1260
                attrs.append("domain=\"[('state', '!=', 'confirm'),('journal_id.type', '=', 'bank')]\"")
1155
1261
1156
1262
            elif field == 'date':
1157
1263
                attrs.append('on_change="onchange_date(date)"')
1158
1264
1159
1265
            elif field == 'analytic_account_id':
1160
1266
                attrs.append('''groups="analytic.group_analytic_accounting"''') # Currently it is not working due to framework problem may be ..
1161
1267
1162
1268
            if field in ('amount_currency', 'currency_id'):
1163
1269
                attrs.append('on_change="onchange_currency(account_id, amount_currency, currency_id, date, journal_id)"')
1164
1270
                attrs.append('''attrs="{'readonly': [('state', '=', 'valid')]}"''')
1165
1271
1166
1272
            if field in widths:
1167
1273
                attrs.append('width="'+str(widths[field])+'"')
1168
1274
1169
1275
            if field in ('journal_id',):
1170
1276
                attrs.append("invisible=\"context.get('journal_id', False)\"")
1171
1277
            elif field in ('period_id',):
1172
1278
                attrs.append("invisible=\"context.get('period_id', False)\"")
1173
1279
            else:
1174
1280
                attrs.append("invisible=\"context.get('visible_id') not in %s\"" % (fields.get(field)))
1175
1281
            xml += '''<field name="%s" %s/>\n''' % (field,' '.join(attrs))
1176
1282
1177
1283
        xml += '''</tree>'''
1178
1284
        result['arch'] = xml
1179
1285
        result['fields'] = self.fields_get(cr, uid, flds, context)
1180
1286
        return result
1181
1287
1182
1288
>>>>>>> MERGE-SOURCE
1183
996
    def _check_moves(self, cr, uid, context=None):
1289
    def _check_moves(self, cr, uid, context=None):
1184
997
        # use the first move ever created for this journal and period
1290
        # use the first move ever created for this journal and period
1185
998
        if context is None:
1291
        if context is None:
1186
@@ -1038,9 +1331,15 @@
1187
1038
            context['journal_id'] = line.journal_id.id
1331
            context['journal_id'] = line.journal_id.id
1188
1039
            context['period_id'] = line.period_id.id
1332
            context['period_id'] = line.period_id.id
1189
1040
            result = super(account_move_line, self).unlink(cr, uid, [line.id], context=context)
1333
            result = super(account_move_line, self).unlink(cr, uid, [line.id], context=context)
1190
1334
<<<<<<< TREE
1191
1041
        move_ids = list(move_ids)
1335
        move_ids = list(move_ids)
1192
1042
        if check and move_ids:
1336
        if check and move_ids:
1193
1043
            move_obj.validate(cr, uid, move_ids, context=context)
1337
            move_obj.validate(cr, uid, move_ids, context=context)
1194
1338
=======
1195
1339
            if check:
1196
1340
                context.update({'lines_cancel': 'cancel'})
1197
1341
                move_obj.validate(cr, uid, [line.move_id.id], context=context)
1198
1342
>>>>>>> MERGE-SOURCE
1199
1044
        return result
1343
        return result
1200
1045
1344
1201
1046
    def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
1345
    def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
1202
@@ -1052,7 +1351,11 @@
1203
1052
        if isinstance(ids, (int, long)):
1351
        if isinstance(ids, (int, long)):
1204
1053
            ids = [ids]
1352
            ids = [ids]
1205
1054
        if vals.get('account_tax_id', False):
1353
        if vals.get('account_tax_id', False):
1206
1354
<<<<<<< TREE
1207
1055
            raise osv.except_osv(_('Unable to change tax!'), _('You cannot change the tax, you should remove and recreate lines.'))
1355
            raise osv.except_osv(_('Unable to change tax!'), _('You cannot change the tax, you should remove and recreate lines.'))
1208
1356
=======
1209
1357
            raise osv.except_osv(_('Unable to change tax !'), _('You can not change the tax, you should remove and recreate lines !'))
1210
1358
>>>>>>> MERGE-SOURCE
1211
1056
        if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
1359
        if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
1212
1057
            raise osv.except_osv(_('Bad Account!'), _('You cannot use an inactive account.'))
1360
            raise osv.except_osv(_('Bad Account!'), _('You cannot use an inactive account.'))
1213
1058
        if update_check:
1361
        if update_check:
1214
@@ -1133,11 +1436,17 @@
1215
1133
        if context is None:
1436
        if context is None:
1216
1134
            context = {}
1437
            context = {}
1217
1135
        if vals.get('move_id', False):
1438
        if vals.get('move_id', False):
1218
1439
<<<<<<< TREE
1219
1136
            move = self.pool.get('account.move').browse(cr, uid, vals['move_id'], context=context)
1440
            move = self.pool.get('account.move').browse(cr, uid, vals['move_id'], context=context)
1220
1137
            if move.company_id:
1441
            if move.company_id:
1221
1138
                vals['company_id'] = move.company_id.id
1442
                vals['company_id'] = move.company_id.id
1222
1139
            if move.date and not vals.get('date'):
1443
            if move.date and not vals.get('date'):
1223
1140
                vals['date'] = move.date
1444
                vals['date'] = move.date
1224
1445
=======
1225
1446
            company_id = self.pool.get('account.move').read(cr, uid, vals['move_id'], ['company_id']).get('company_id', False)
1226
1447
            if company_id:
1227
1448
                vals['company_id'] = company_id[0]
1228
1449
>>>>>>> MERGE-SOURCE
1229
1141
        if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
1450
        if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
1230
1142
            raise osv.except_osv(_('Bad Account!'), _('You cannot use an inactive account.'))
1451
            raise osv.except_osv(_('Bad Account!'), _('You cannot use an inactive account.'))
1231
1143
        if 'journal_id' in vals and vals['journal_id']:
1452
        if 'journal_id' in vals and vals['journal_id']:
1232
1144
1453
1233
=== modified file 'account/account_report.xml'
1234
--- account/account_report.xml	2013-02-22 15:59:32 +0000
1235
+++ account/account_report.xml	2013-06-03 06:13:34 +0000
1236
@@ -41,5 +41,32 @@
1237
41
            groups="group_account_user,group_account_manager"
41
            groups="group_account_user,group_account_manager"
1238
42
            parent="account.menu_finance_generic_reporting" sequence="3"/>
42
            parent="account.menu_finance_generic_reporting" sequence="3"/>
1239
43
43
1240
44
<<<<<<< TREE
1241
45
=======
1242
46
        <report id="account_account_balance_landscape"
1243
47
            string="Account balance"
1244
48
            model="account.account"
1245
49
            name="account.account.balance.landscape"
1246
50
            rml="account/report/account_balance_landscape.rml"
1247
51
            auto="False"
1248
52
            menu="False"/>
1249
53
1250
54
        <report id="account_balance_sheet"
1251
55
            string="Balance Sheet"
1252
56
            model="account.account"
1253
57
            name="account.balancesheet"
1254
58
            rml="account/report/account_balance_sheet.rml"
1255
59
            auto="False"
1256
60
            menu="False"/>
1257
61
1258
62
        <report id="account_balance_sheet_horizontal"
1259
63
            string="Balance Sheet Horizontal"
1260
64
            model="account.account"
1261
65
            name="account.balancesheet.horizontal"
1262
66
            rml="account/report/account_balance_sheet_horizontal.rml"
1263
67
            auto="False"
1264
68
            menu="False"/>
1265
69
1266
70
>>>>>>> MERGE-SOURCE
1267
44
    </data>
71
    </data>
1268
45
</openerp>
72
</openerp>
1269
46
73
1270
=== modified file 'account/account_view.xml'
1271
--- account/account_view.xml	2013-05-14 12:03:41 +0000
1272
+++ account/account_view.xml	2013-06-03 06:13:34 +0000
1273
@@ -240,6 +240,41 @@
1274
240
                </search>
240
                </search>
1275
241
            </field>
241
            </field>
1276
242
        </record>
242
        </record>
1277
243
<<<<<<< TREE
1278
244
=======
1279
245
1280
246
        <record id="view_account_list" model="ir.ui.view">
1281
247
            <field name="name">account.account.list</field>
1282
248
            <field name="model">account.account</field>
1283
249
            <field name="type">tree</field>
1284
250
            <field name="priority" eval="1"/>
1285
251
            <field name="arch" type="xml">
1286
252
                <tree colors="blue:type in ('view');black:type in ('other','receivable','payable','consolidation');gray:type in ('closed')" string="Chart of accounts" toolbar="1" >
1287
253
                    <field name="code"/>
1288
254
                    <field name="name"/>
1289
255
                    <field name="parent_id" invisible="1"/>
1290
256
                    <field name="user_type" invisible="1"/>
1291
257
                    <field name="debit"/>
1292
258
                    <field name="credit"/>
1293
259
                    <field name="balance"/>
1294
260
                    <field name="type"/>
1295
261
                    <field name="company_id" groups="base.group_multi_company"/>
1296
262
                    <field name="company_currency_id"/>
1297
263
                </tree>
1298
264
            </field>
1299
265
        </record>
1300
266
        <record id="view_treasory_graph" model="ir.ui.view">
1301
267
           <field name="name">account.treasury.graph</field>
1302
268
           <field name="model">account.account</field>
1303
269
           <field name="type">graph</field>
1304
270
           <field name="arch" type="xml">
1305
271
               <graph string="Treasury Analysis" type="bar">
1306
272
                  <field name="name"/>
1307
273
                  <field name="balance" operator="+"/>
1308
274
               </graph>
1309
275
         </field>
1310
276
      </record>
1311
277
>>>>>>> MERGE-SOURCE
1312
243
        <record id="action_account_form" model="ir.actions.act_window">
278
        <record id="action_account_form" model="ir.actions.act_window">
1313
244
            <field name="name">Accounts</field>
279
            <field name="name">Accounts</field>
1314
245
            <field name="res_model">account.account</field>
280
            <field name="res_model">account.account</field>
1315
@@ -409,6 +444,7 @@
1316
409
                            <field name="company_id" groups="base.group_multi_company"/>
444
                            <field name="company_id" groups="base.group_multi_company"/>
1317
410
                        </group>
445
                        </group>
1318
411
                    </group>
446
                    </group>
1319
447
<<<<<<< TREE
1320
412
                    <notebook>
448
                    <notebook>
1321
413
                        <page string="Advanced Settings">
449
                        <page string="Advanced Settings">
1322
414
                            <group>
450
                            <group>
1323
@@ -422,6 +458,45 @@
1324
422
                                    <field name="allow_date"/>
458
                                    <field name="allow_date"/>
1325
423
                                    <field name="group_invoice_lines"/>
459
                                    <field name="group_invoice_lines"/>
1326
424
                                </group>
460
                                </group>
1327
461
=======
1328
462
                    <notebook colspan="4">
1329
463
                        <page string="General Information">
1330
464
                            <group col="2" colspan="2">
1331
465
                                <group colspan="2" col="2">
1332
466
                                    <separator string="Accounts" colspan="4"/>
1333
467
                                    <field name="default_debit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
1334
468
                                    <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
1335
469
                                </group>
1336
470
                                <group colspan="2" col="2">
1337
471
                                    <separator string="Journal View" colspan="4"/>
1338
472
                                    <field name="view_id" widget="selection"/>
1339
473
                                </group>
1340
474
                            </group>
1341
475
1342
476
                            <group colspan="2" col="2">
1343
477
                                <separator string="Company" colspan="4"/>
1344
478
                                <field name="company_id" groups="base.group_multi_company"/>
1345
479
                                <field name="user_id" groups="base.group_extended"/>
1346
480
                                <field name="currency"/>
1347
481
                            </group>
1348
482
                            <group colspan="2" col="2">
1349
483
                                <separator string="Validations" colspan="4"/>
1350
484
                                <field name="allow_date" groups="base.group_extended"/>
1351
485
                            </group>
1352
486
                            <group colspan="2" col="2">
1353
487
                                <separator string="Other Configuration" colspan="4"/>
1354
488
                                <field name="centralisation" groups="base.group_extended"/>
1355
489
                                <field name="entry_posted"/>
1356
490
                            </group>
1357
491
                            <group colspan="2" col="2">
1358
492
                                <separator string="Invoicing Data" colspan="4"/>
1359
493
<!--                                <field name="invoice_sequence_id"/>-->
1360
494
                                <field name="group_invoice_lines"/>
1361
495
                            </group>
1362
496
                            <group colspan="2" col="2" groups="base.group_extended">
1363
497
                                <separator string="Sequence" colspan="4"/>
1364
498
                                <field name="sequence_id" required="0"/>
1365
499
>>>>>>> MERGE-SOURCE
1366
425
                            </group>
500
                            </group>
1367
426
                        </page>
501
                        </page>
1368
427
                        <page string="Entry Controls">
502
                        <page string="Entry Controls">
1369
@@ -576,10 +651,16 @@
1370
576
                            <field name="balance_end_real" widget="monetary" options='{"currency_field" : "currency"}'/>
651
                            <field name="balance_end_real" widget="monetary" options='{"currency_field" : "currency"}'/>
1371
577
                        </group>
652
                        </group>
1372
578
                    </group>
653
                    </group>
1373
654
<<<<<<< TREE
1374
579
655
1375
580
                    <notebook>
656
                    <notebook>
1376
581
                        <page string="Transactions" name="statement_line_ids">
657
                        <page string="Transactions" name="statement_line_ids">
1377
582
                            <field name="line_ids" context="{'date':date}">
658
                            <field name="line_ids" context="{'date':date}">
1378
659
=======
1379
660
                    <notebook colspan="4">
1380
661
                        <page string="Transaction" name="statement_line_ids">
1381
662
                            <field colspan="4" name="line_ids" nolabel="1" context="{'date':date}">
1382
663
>>>>>>> MERGE-SOURCE
1383
583
                                <tree editable="bottom" string="Statement lines">
664
                                <tree editable="bottom" string="Statement lines">
1384
584
                                    <field name="sequence" readonly="1" invisible="1"/>
665
                                    <field name="sequence" readonly="1" invisible="1"/>
1385
585
                                    <field name="date"/>
666
                                    <field name="date"/>
1386
@@ -608,6 +689,28 @@
1387
608
                                </form>
689
                                </form>
1388
609
                            </field>
690
                            </field>
1389
610
                        </page>
691
                        </page>
1390
692
<<<<<<< TREE
1391
693
=======
1392
694
                        <page string="Journal Entries" name="move_live_ids">
1393
695
                            <field colspan="4" name="move_line_ids" nolabel="1" mode="tree,form">
1394
696
                            	<tree string="Journal Items" editable="top" on_write="on_create_write">
1395
697
									<field name="move_id"/>
1396
698
									<field name="ref"/>
1397
699
									<field name="date"/>
1398
700
									<field name="period_id"/>
1399
701
									<field name="partner_id" on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/>
1400
702
									<field name="account_id"/>
1401
703
									<field name="name"/>
1402
704
									<field name="journal_id" invisible="1"/>
1403
705
									<field name="debit" sum="Total debit"/>
1404
706
									<field name="credit" sum="Total credit"/>
1405
707
									<field name="reconcile_partial_id" groups="base.group_extended"/>
1406
708
									<field name="reconcile_id"/>
1407
709
									<field name="state"/>
1408
710
								</tree>
1409
711
                            </field>
1410
712
                        </page>
1411
713
>>>>>>> MERGE-SOURCE
1412
611
                    </notebook>
714
                    </notebook>
1413
612
                </sheet>
715
                </sheet>
1414
613
                </form>
716
                </form>
1415
@@ -1287,9 +1390,14 @@
1416
1287
                    </group>
1390
                    </group>
1417
1288
                    <notebook>
1391
                    <notebook>
1418
1289
                        <page string="Journal Items">
1392
                        <page string="Journal Items">
1419
1393
<<<<<<< TREE
1420
1290
                            <field name="line_id" widget="one2many_list"
1394
                            <field name="line_id" widget="one2many_list"
1421
1291
                              context="{'line_id': line_id , 'journal_id': journal_id }">
1395
                              context="{'line_id': line_id , 'journal_id': journal_id }">
1422
1292
                                <form string="Journal Item" version="7.0">
1396
                                <form string="Journal Item" version="7.0">
1423
1397
=======
1424
1398
                            <field colspan="4" name="line_id" nolabel="1" height="250" widget="one2many_list" default_get="{'lines':line_id , 'journal':journal_id, 'period_id':period_id}">
1425
1399
                                <form string="Journal Item">
1426
1400
>>>>>>> MERGE-SOURCE
1427
1293
                                    <group col="6" colspan="4">
1401
                                    <group col="6" colspan="4">
1428
1294
                                        <field name="name"/>
1402
                                        <field name="name"/>
1429
1295
                                        <field name="ref"/>
1403
                                        <field name="ref"/>
1430
@@ -1444,10 +1552,15 @@
1431
1444
        <act_window
1552
        <act_window
1432
1445
            id="act_account_move_to_account_move_line_open"
1553
            id="act_account_move_to_account_move_line_open"
1433
1446
            name="Journal Items"
1554
            name="Journal Items"
1434
1555
<<<<<<< TREE
1435
1447
            context="{'search_default_journal_id': active_id, 'default_journal_id': active_id}"
1556
            context="{'search_default_journal_id': active_id, 'default_journal_id': active_id}"
1436
1557
=======
1437
1558
            context="{'search_default_move_id':[active_id], 'default_move_id': active_id}"
1438
1559
>>>>>>> MERGE-SOURCE
1439
1448
            res_model="account.move.line"
1560
            res_model="account.move.line"
1440
1449
            src_model="account.move"/>
1561
            src_model="account.move"/>
1441
1450
1562
1442
1563
<<<<<<< TREE
1443
1451
        <act_window
1564
        <act_window
1444
1452
            domain="[('reconcile_id', '=', active_id)]"
1565
            domain="[('reconcile_id', '=', active_id)]"
1445
1453
            id="act_account_acount_move_line_reconcile_open"
1566
            id="act_account_acount_move_line_reconcile_open"
1446
@@ -1456,6 +1569,66 @@
1447
1456
            src_model="account.move.reconcile"/>
1569
            src_model="account.move.reconcile"/>
1448
1457
1570
1449
1458
        <!-- TODO: Print Journal (and change state), Close Journal (and verify that there is no draft Entry Lines) -->
1571
        <!-- TODO: Print Journal (and change state), Close Journal (and verify that there is no draft Entry Lines) -->
1450
1572
=======
1451
1573
        <record id="action_move_line_search" model="ir.actions.act_window">
1452
1574
            <field name="name">Journal Items</field>
1453
1575
            <field name="type">ir.actions.act_window</field>
1454
1576
            <field name="res_model">account.move.line</field>
1455
1577
            <field name="view_type">form</field>
1456
1578
            <field name="view_mode">tree,form</field>
1457
1579
            <field name="view_id" ref="view_move_line_tree"/>
1458
1580
            <field name="search_view_id" ref="view_account_move_line_filter"/>
1459
1581
        </record>
1460
1582
        <record id="action_move_line_search_view1" model="ir.actions.act_window.view">
1461
1583
            <field eval="10" name="sequence"/>
1462
1584
            <field name="view_mode">tree</field>
1463
1585
            <field name="view_id" ref="view_move_line_tree"/>
1464
1586
            <field name="act_window_id" ref="action_move_line_search"/>
1465
1587
        </record>
1466
1588
        <record id="action_move_line_search_view2" model="ir.actions.act_window.view">
1467
1589
            <field eval="11" name="sequence"/>
1468
1590
            <field name="view_mode">form</field>
1469
1591
            <field name="act_window_id" ref="action_move_line_search"/>
1470
1592
        </record>
1471
1593
1472
1594
        <act_window
1473
1595
            context="{'search_default_next_partner':1,'view_mode':True}"
1474
1596
            id="action_account_manual_reconcile" name="Journal Items"
1475
1597
            res_model="account.move.line"
1476
1598
            view_id="view_move_line_tree"/>
1477
1599
1478
1600
1479
1601
        <menuitem
1480
1602
             name="Manual Reconciliation" icon="STOCK_EXECUTE"
1481
1603
             action="action_account_manual_reconcile"
1482
1604
             id="menu_manual_reconcile"
1483
1605
             parent="account.periodical_processing_reconciliation"/>
1484
1606
1485
1607
1486
1608
        <act_window
1487
1609
            id="act_account_acount_move_line_open"
1488
1610
            name="Entries"
1489
1611
            context="{'search_default_account_id':[active_id], 'search_default_unreconciled':0, 'default_account_id': active_id}"
1490
1612
            res_model="account.move.line"
1491
1613
            src_model="account.account"/>
1492
1614
1493
1615
        <act_window
1494
1616
            id="act_account_acount_move_line_open_unreconciled"
1495
1617
            name="Unreconciled Entries"
1496
1618
            res_model="account.move.line"
1497
1619
            context="{'search_default_account_id':[active_id], 'search_default_unreconciled':1, 'default_account_id': active_id}"
1498
1620
            src_model="account.account"/>
1499
1621
1500
1622
        <act_window domain="[('reconcile_id', '=', active_id)]" id="act_account_acount_move_line_reconcile_open" name="Reconciled entries" res_model="account.move.line" src_model="account.move.reconcile"/>
1501
1623
1502
1624
1503
1625
        <!--
1504
1626
    TODO:
1505
1627
        Print Journal (and change state)
1506
1628
        Close Journal (and verify that there is no draft Entry Lines)
1507
1629
-->
1508
1630
1509
1631
>>>>>>> MERGE-SOURCE
1510
1459
        <record id="view_journal_period_tree" model="ir.ui.view">
1632
        <record id="view_journal_period_tree" model="ir.ui.view">
1511
1460
            <field name="name">account.journal.period.tree</field>
1633
            <field name="name">account.journal.period.tree</field>
1512
1461
            <field name="model">account.journal.period</field>
1634
            <field name="model">account.journal.period</field>
1513
@@ -1766,11 +1939,106 @@
1514
1766
            <field name="model">account.subscription.line</field>
1939
            <field name="model">account.subscription.line</field>
1515
1767
            <field eval="20" name="priority"/>
1940
            <field eval="20" name="priority"/>
1516
1768
            <field name="arch" type="xml">
1941
            <field name="arch" type="xml">
1517
1942
<<<<<<< TREE
1518
1769
                <form string="Subscription lines" version="7.0">
1943
                <form string="Subscription lines" version="7.0">
1519
1770
                    <group col="4">
1944
                    <group col="4">
1520
1771
                        <field name="subscription_id"/>
1945
                        <field name="subscription_id"/>
1521
1772
                        <field name="date"/>
1946
                        <field name="date"/>
1522
1773
                        <field name="move_id"/>
1947
                        <field name="move_id"/>
1523
1948
=======
1524
1949
                <form string="Subscription lines">
1525
1950
                    <field name="subscription_id"/>
1526
1951
                    <field name="date"/>
1527
1952
                    <field name="move_id"/>
1528
1953
                </form>
1529
1954
            </field>
1530
1955
        </record>
1531
1956
1532
1957
        <record id="action_move_line_tree1" model="ir.actions.act_window">
1533
1958
            <field name="name">Journal Items</field>
1534
1959
            <field name="res_model">account.move.line</field>
1535
1960
            <field name="view_type">form</field>
1536
1961
            <field name="view_mode">tree,form</field>
1537
1962
            <field name="domain">[('account_id','child_of', [active_id]),('state','&lt;&gt;','draft')]</field>
1538
1963
            <field name="context">{'account_id':active_id}</field>
1539
1964
        </record>
1540
1965
1541
1966
        <record id="view_move_line_tax_tree" model="ir.ui.view">
1542
1967
            <field name="name">account.move.line.tax.tree</field>
1543
1968
            <field name="model">account.move.line</field>
1544
1969
            <field name="type">tree</field>
1545
1970
            <field eval="4" name="priority"/>
1546
1971
            <field name="arch" type="xml">
1547
1972
                <tree colors="red:state in ('draft');black:state in ('valid')" string="Journal Items">
1548
1973
                    <field name="date"/>
1549
1974
                    <field name="move_id"/>
1550
1975
                    <field name="statement_id" string="St."/>
1551
1976
                    <field name="name"/>
1552
1977
                    <field name="partner_id"/>
1553
1978
                    <field name="account_id"/>
1554
1979
                    <field name="tax_code_id"/>
1555
1980
                    <field name="tax_amount"/>
1556
1981
                    <field name="debit" sum="Total debit"/>
1557
1982
                    <field name="credit" sum="Total credit"/>
1558
1983
                    <field name="account_tax_id"/>
1559
1984
                    <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
1560
1985
                    <field name="state"/>
1561
1986
                </tree>
1562
1987
            </field>
1563
1988
        </record>
1564
1989
1565
1990
        <record id="action_tax_code_line_open" model="ir.actions.act_window">
1566
1991
            <field name="name">Journal Items</field>
1567
1992
            <field name="res_model">account.move.line</field>
1568
1993
            <field name="view_type">form</field>
1569
1994
            <field name="view_mode">tree,form</field>
1570
1995
            <field name="view_id" ref="view_move_line_tax_tree"/>
1571
1996
            <field name="domain">[('tax_code_id','child_of',active_id),('state','&lt;&gt;','draft')]</field>
1572
1997
        </record>
1573
1998
        <record id="ir_open_tax_move_line" model="ir.values">
1574
1999
            <field name="key2">tree_but_open</field>
1575
2000
            <field name="model">account.tax.code</field>
1576
2001
            <field name="name">Tax Details</field>
1577
2002
            <field eval="'ir.actions.act_window,%d'%action_tax_code_line_open" name="value"/>
1578
2003
            <field eval="True" name="object"/>
1579
2004
        </record>
1580
2005
1581
2006
1582
2007
        <!--
1583
2008
    # Admin config
1584
2009
    -->
1585
2010
1586
2011
        <act_window
1587
2012
           id="act_account_journal_2_account_bank_statement"
1588
2013
           name="Bank statements"
1589
2014
           context="{'search_default_journal_id': active_id, 'default_journal_id': active_id}"
1590
2015
           res_model="account.bank.statement"
1591
2016
           src_model="account.journal"/>
1592
2017
1593
2018
        <act_window
1594
2019
           id="act_account_journal_2_account_move_line"
1595
2020
           name="Journal Items"
1596
2021
           context="{'search_default_journal_id':active_id, 'default_journal_id': active_id}"
1597
2022
           res_model="account.move.line"
1598
2023
           src_model="account.journal"/>
1599
2024
1600
2025
        <act_window context="{'search_default_reconcile_id':False, 'search_default_partner_id':[active_id], 'default_partner_id': active_id}" domain="[('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner" groups="base.group_extended"/>
1601
2026
1602
2027
        <act_window context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner" groups="account.group_account_user"/>
1603
2028
1604
2029
        <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
1605
2030
            <field name="name">Create Account</field>
1606
2031
            <field name="model">account.addtmpl.wizard</field>
1607
2032
            <field name="type">form</field>
1608
2033
            <field name="arch" type="xml">
1609
2034
                <form string="Create Account">
1610
2035
                    <separator col="4" colspan="4" string="Create an Account based on this template"/>
1611
2036
                    <field name="cparent_id"/>
1612
2037
                    <newline/>
1613
2038
                    <group col="2" colspan="2">
1614
2039
                        <button icon="gtk-cancel" special="cancel" string="Cancel" name="action_cancel" type="object"/>
1615
2040
                        <button icon="gtk-ok" name="action_create" string="Add" type="object"/>
1616
2041
>>>>>>> MERGE-SOURCE
1617
1774
                    </group>
2042
                    </group>
1618
1775
                </form>
2043
                </form>
1619
1776
            </field>
2044
            </field>
1620
@@ -2268,7 +2536,11 @@
1621
2268
                    </group>
2536
                    </group>
1622
2269
                    <notebook>
2537
                    <notebook>
1623
2270
                        <page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}">
2538
                        <page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}">
1624
2539
<<<<<<< TREE
1625
2271
                            <field name="line_ids" context="{'date':date}">
2540
                            <field name="line_ids" context="{'date':date}">
1626
2541
=======
1627
2542
                            <field colspan="4" name="line_ids" nolabel="1" context="{'date':date}">
1628
2543
>>>>>>> MERGE-SOURCE
1629
2272
                                <tree editable="bottom" string="Statement lines">
2544
                                <tree editable="bottom" string="Statement lines">
1630
2273
                                    <field name="sequence" invisible="1"/>
2545
                                    <field name="sequence" invisible="1"/>
1631
2274
                                    <field name="date"/>
2546
                                    <field name="date"/>
1632
2275
2547
1633
=== modified file 'account/board_account_view.xml'
1634
--- account/board_account_view.xml	2012-11-29 22:26:45 +0000
1635
+++ account/board_account_view.xml	2013-06-03 06:13:34 +0000
1636
@@ -2,6 +2,7 @@
1637
2
<openerp>
2
<openerp>
1638
3
    <data>
3
    <data>
1639
4
4
1640
5
<<<<<<< TREE
1641
5
        <record id="action_company_analysis_tree" model="ir.actions.act_window">
6
        <record id="action_company_analysis_tree" model="ir.actions.act_window">
1642
6
            <field name="name">Company Analysis</field>
7
            <field name="name">Company Analysis</field>
1643
7
            <field name="res_model">account.entries.report</field>
8
            <field name="res_model">account.entries.report</field>
1644
@@ -10,18 +11,85 @@
1645
10
            <field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
11
            <field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
1646
11
            <field name="view_id" ref="account.view_account_entries_report_tree"/>
12
            <field name="view_id" ref="account.view_account_entries_report_tree"/>
1647
12
            <field name="domain">[('year','=',time.strftime('%Y'))]</field>
13
            <field name="domain">[('year','=',time.strftime('%Y'))]</field>
1650
13
        </record>
14
=======
1651
14
15
    	<record id="note_account_type" model="board.note.type">
1652
16
            <field name="name">Accountants</field>
1653
17
>>>>>>> MERGE-SOURCE
1654
18
        </record>
1655
19
1656
20
<<<<<<< TREE
1657
21
=======
1658
22
        <record id="action_aged_receivable" model="ir.actions.act_window">
1659
23
            <field name="name">Receivable Accounts</field>
1660
24
            <field name="res_model">report.account.receivable</field>
1661
25
            <field name="view_type">form</field>
1662
26
            <field name="view_mode">graph,tree</field>
1663
27
            <field name="domain">[('type','=','receivable')]</field>
1664
28
        </record>
1665
29
        <record id="action_aged_income" model="ir.actions.act_window">
1666
30
            <field name="name">Income Accounts</field>
1667
31
            <field name="res_model">report.account.receivable</field>
1668
32
            <field name="view_type">form</field>
1669
33
            <field name="view_mode">graph,tree</field>
1670
34
            <field name="domain">[('type','=','income')]</field>
1671
35
        </record>
1672
36
      	
1673
37
      	<record id="action_company_analysis_tree" model="ir.actions.act_window">
1674
38
        	<field name="name">Company Analysis</field>
1675
39
			<field name="res_model">account.entries.report</field>
1676
40
			<field name="view_type">form</field>
1677
41
			<field name="view_mode">tree,graph</field>
1678
42
			<field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
1679
43
			<field name="view_id" ref="account.view_account_entries_report_tree"/>
1680
44
			<field name="domain">[('year','=',time.strftime('%Y'))]</field>
1681
45
		</record>
1682
46
		
1683
47
		<record id="action_treasory_graph" model="ir.actions.act_window">
1684
48
			<field name="name">Treasury</field>
1685
49
			<field name="res_model">account.account</field>
1686
50
  			<field name="view_type">form</field>
1687
51
			<field name="view_mode">graph,tree</field>
1688
52
			<field name="domain">[('type','=','liquidity')]</field>
1689
53
			<field name="view_id" ref="account.view_treasory_graph"/>
1690
54
		</record>
1691
55
1692
56
		<record id="action_draft_customer_invoices_dashboard" model="ir.actions.act_window">
1693
57
			<field name="name">Customer Invoices to Approve</field>
1694
58
			<field name="res_model">account.invoice</field>
1695
59
			<field name="view_type">form</field>
1696
60
			<field name="view_mode">tree,form,calendar,graph</field>
1697
61
			<field eval="False" name="view_id"/>
1698
62
			<field name="domain">[('state','=','draft'),('type','=','out_invoice')]</field>
1699
63
			<field name="context">{'type':'out_invoice', 'journal_type': 'sale'}</field>
1700
64
			<field name="search_view_id" ref="account.view_account_invoice_filter"/>
1701
65
		</record>
1702
66
        
1703
67
>>>>>>> MERGE-SOURCE
1704
15
        <record id="board_account_form" model="ir.ui.view">
68
        <record id="board_account_form" model="ir.ui.view">
1705
16
            <field name="name">board.account.form</field>
69
            <field name="name">board.account.form</field>
1706
17
            <field name="model">board.board</field>
70
            <field name="model">board.board</field>
1707
18
            <field name="arch" type="xml">
71
            <field name="arch" type="xml">
1708
72
<<<<<<< TREE
1709
19
                <form string="Account Board" version="7.0">
73
                <form string="Account Board" version="7.0">
1710
20
                    <board style="2-1">
74
                    <board style="2-1">
1711
21
                        <column>
75
                        <column>
1712
22
                            <action name="%(action_company_analysis_tree)d" string="Company Analysis"/>
76
                            <action name="%(action_company_analysis_tree)d" string="Company Analysis"/>
1713
23
                        </column>
77
                        </column>
1714
24
                    </board>
78
                    </board>
1715
79
=======
1716
80
                <form string="Account Board">
1717
81
                    <hpaned>
1718
82
                        <child1>
1719
83
                            <action colspan="4" height="160" width="400" name="%(action_draft_customer_invoices_dashboard)d" string="Customer Invoices to Approve" />
1720
84
                            <action colspan="4" height="160" width="400" name="%(action_company_analysis_tree)d" string="Company Analysis" groups="account.group_account_manager"/>
1721
85
                        </child1>
1722
86
                        <child2>
1723
87
                            <action colspan="4" height="220" name="%(action_treasory_graph)d" string="Treasury" groups="account.group_account_manager,account.group_account_user"/>
1724
88
                            <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged Receivables" groups="account.group_account_manager,account.group_account_user"/>
1725
89
                            <!--  <action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/> -->
1726
90
                        </child2>
1727
91
                    </hpaned>
1728
92
>>>>>>> MERGE-SOURCE
1729
25
                </form>
93
                </form>
1730
26
            </field>
94
            </field>
1731
27
        </record>
95
        </record>
1732
28
96
1733
=== modified file 'account/data/configurable_account_chart.xml'
1734
--- account/data/configurable_account_chart.xml	2012-11-29 22:26:45 +0000
1735
+++ account/data/configurable_account_chart.xml	2013-06-03 06:13:34 +0000
1736
@@ -31,10 +31,24 @@
1737
31
        <record model="account.account.type" id="conf_account_type_equity">
31
        <record model="account.account.type" id="conf_account_type_equity">
1738
32
          <field name="name">Equity</field>
32
          <field name="name">Equity</field>
1739
33
          <field name="code">equity</field>
33
          <field name="code">equity</field>
1740
34
<<<<<<< TREE
1741
34
          <field name="close_method">balance</field>
35
          <field name="close_method">balance</field>
1742
35
          <field name="report_type">liability</field>
36
          <field name="report_type">liability</field>
1743
36
        </record>
37
        </record>
1744
37
        <record model="account.account.type" id="conf_account_type_chk">
38
        <record model="account.account.type" id="conf_account_type_chk">
1745
39
=======
1746
40
          <field name="report_type">liability</field>
1747
41
          <field name="close_method">balance</field>
1748
42
        </record>
1749
43
1750
44
         <record model="account.account.type" id="conf_account_type_bnk">
1751
45
          <field name="name">Bank</field>
1752
46
          <field name="code">bank</field>
1753
47
          <field name="report_type">asset</field>
1754
48
          <field name="close_method">balance</field>
1755
49
        </record>
1756
50
         <record model="account.account.type" id="conf_account_type_chk">
1757
51
>>>>>>> MERGE-SOURCE
1758
38
          <field name="name">Check</field>
52
          <field name="name">Check</field>
1759
39
          <field name="code">check</field>
53
          <field name="code">check</field>
1760
40
          <field name="close_method">balance</field>
54
          <field name="close_method">balance</field>
1761
41
55
1762
=== modified file 'account/demo/account_minimal.xml'
1763
--- account/demo/account_minimal.xml	2012-12-15 18:15:44 +0000
1764
+++ account/demo/account_minimal.xml	2013-06-03 06:13:34 +0000
1765
@@ -8,8 +8,19 @@
1766
8
        <record id="account_type_cash_equity" model="account.account.type">
8
        <record id="account_type_cash_equity" model="account.account.type">
1767
9
            <field name="name">Equity</field>
9
            <field name="name">Equity</field>
1768
10
            <field name="code">equity</field>
10
            <field name="code">equity</field>
1771
11
            <field name="close_method">balance</field>
11
<<<<<<< TREE
1772
12
            <field name="report_type">liability</field>
12
            <field name="close_method">balance</field>
1773
13
            <field name="report_type">liability</field>
1774
14
=======
1775
15
            <field name="report_type">liability</field>
1776
16
            <field name="close_method">balance</field>
1777
17
        </record>
1778
18
        <record id="account_type_cash_moves" model="account.account.type">
1779
19
            <field name="name">Cash</field>
1780
20
            <field name="code">cash</field>
1781
21
            <field name="report_type">asset</field>
1782
22
            <field name="close_method">balance</field>
1783
23
>>>>>>> MERGE-SOURCE
1784
13
        </record>
24
        </record>
1785
14
25
1786
15
        <!--
26
        <!--
1787
16
27
1788
=== modified file 'account/i18n/account.pot'
1789
--- account/i18n/account.pot	2013-03-14 11:27:40 +0000
1790
+++ account/i18n/account.pot	2013-06-03 06:13:34 +0000
1791
@@ -4,10 +4,17 @@
1792
4
#
4
#
1793
5
msgid ""
5
msgid ""
1794
6
msgstr ""
6
msgstr ""
1795
7
<<<<<<< TREE
1796
7
"Project-Id-Version: OpenERP Server 7.0alpha\n"
8
"Project-Id-Version: OpenERP Server 7.0alpha\n"
1797
8
"Report-Msgid-Bugs-To: \n"
9
"Report-Msgid-Bugs-To: \n"
1798
9
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
10
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
1799
10
"PO-Revision-Date: 2012-12-21 17:04+0000\n"
11
"PO-Revision-Date: 2012-12-21 17:04+0000\n"
1800
12
=======
1801
13
"Project-Id-Version: OpenERP Server 6.0.2\n"
1802
14
"Report-Msgid-Bugs-To: support@openerp.com\n"
1803
15
"POT-Creation-Date: 2011-05-09 10:18+0000\n"
1804
16
"PO-Revision-Date: 2011-05-09 10:18+0000\n"
1805
17
>>>>>>> MERGE-SOURCE
1806
11
"Last-Translator: <>\n"
18
"Last-Translator: <>\n"
1807
12
"Language-Team: \n"
19
"Language-Team: \n"
1808
13
"MIME-Version: 1.0\n"
20
"MIME-Version: 1.0\n"
1809
@@ -21,6 +28,7 @@
1810
21
msgstr ""
28
msgstr ""
1811
22
29
1812
23
#. module: account
30
#. module: account
1813
31
<<<<<<< TREE
1814
24
#: sql_constraint:account.fiscal.position.account:0
32
#: sql_constraint:account.fiscal.position.account:0
1815
25
msgid "An account fiscal position could be defined only once time on same accounts."
33
msgid "An account fiscal position could be defined only once time on same accounts."
1816
26
msgstr ""
34
msgstr ""
1817
@@ -28,6 +36,16 @@
1818
28
#. module: account
36
#. module: account
1819
29
#: help:account.tax.code,sequence:0
37
#: help:account.tax.code,sequence:0
1820
30
msgid "Determine the display order in the report 'Accounting \\ Reporting \\ Generic Reporting \\ Taxes \\ Taxes Report'"
38
msgid "Determine the display order in the report 'Accounting \\ Reporting \\ Generic Reporting \\ Taxes \\ Taxes Report'"
1821
39
=======
1822
40
#: view:account.journal:0
1823
41
msgid "Other Configuration"
1824
42
msgstr ""
1825
43
1826
44
#. module: account
1827
45
#: code:addons/account/account.py:516
1828
46
#, python-format
1829
47
msgid "You cannot remove/deactivate an account which is set as a property to any Partner."
1830
48
>>>>>>> MERGE-SOURCE
1831
31
msgstr ""
49
msgstr ""
1832
32
50
1833
33
#. module: account
51
#. module: account
1834
@@ -53,7 +71,11 @@
1835
53
msgstr ""
71
msgstr ""
1836
54
72
1837
55
#. module: account
73
#. module: account
1838
74
<<<<<<< TREE
1839
56
#: code:addons/account/account_bank_statement.py:368
75
#: code:addons/account/account_bank_statement.py:368
1840
76
=======
1841
77
#: code:addons/account/invoice.py:793
1842
78
>>>>>>> MERGE-SOURCE
1843
57
#, python-format
79
#, python-format
1844
58
msgid "Journal item \"%s\" is not valid."
80
msgid "Journal item \"%s\" is not valid."
1845
59
msgstr ""
81
msgstr ""
1846
@@ -83,6 +105,7 @@
1847
83
msgstr ""
105
msgstr ""
1848
84
106
1849
85
#. module: account
107
#. module: account
1850
108
<<<<<<< TREE
1851
86
#: constraint:account.account.template:0
109
#: constraint:account.account.template:0
1852
87
msgid "Error!\n"
110
msgid "Error!\n"
1853
88
"You cannot create recursive account templates."
111
"You cannot create recursive account templates."
1854
@@ -90,6 +113,32 @@
1855
90
113
1856
91
#. module: account
114
#. module: account
1857
92
#. openerp-web
115
#. openerp-web
1858
116
=======
1859
117
#: view:account.unreconcile:0
1860
118
msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"
1861
119
msgstr ""
1862
120
1863
121
#. module: account
1864
122
#: report:account.tax.code.entries:0
1865
123
msgid "Accounting Entries-"
1866
124
msgstr ""
1867
125
1868
126
#. module: account
1869
127
#: code:addons/account/account.py:1305
1870
128
#, python-format
1871
129
msgid "You can not delete posted movement: \"%s\"!"
1872
130
msgstr ""
1873
131
1874
132
#. module: account
1875
133
#: report:account.invoice:0
1876
134
#: field:account.invoice.line,origin:0
1877
135
msgid "Origin"
1878
136
msgstr ""
1879
137
1880
138
#. module: account
1881
139
#: view:account.account:0
1882
140
#: field:account.account,reconcile:0
1883
141
>>>>>>> MERGE-SOURCE
1884
93
#: view:account.automatic.reconcile:0
142
#: view:account.automatic.reconcile:0
1885
94
#: field:account.move.line,reconcile_id:0
143
#: field:account.move.line,reconcile_id:0
1886
95
#: view:account.move.line.reconcile:0
144
#: view:account.move.line.reconcile:0
1887
@@ -117,6 +166,7 @@
1888
117
msgstr ""
166
msgstr ""
1889
118
167
1890
119
#. module: account
168
#. module: account
1891
169
<<<<<<< TREE
1892
120
#: code:addons/account/account.py:641
170
#: code:addons/account/account.py:641
1893
121
#: code:addons/account/account.py:686
171
#: code:addons/account/account.py:686
1894
122
#: code:addons/account/account.py:781
172
#: code:addons/account/account.py:781
1895
@@ -136,6 +186,9 @@
1896
136
#: code:addons/account/wizard/account_state_open.py:37
186
#: code:addons/account/wizard/account_state_open.py:37
1897
137
#: code:addons/account/wizard/account_validate_account_move.py:39
187
#: code:addons/account/wizard/account_validate_account_move.py:39
1898
138
#: code:addons/account/wizard/account_validate_account_move.py:61
188
#: code:addons/account/wizard/account_validate_account_move.py:61
1899
189
=======
1900
190
#: code:addons/account/invoice.py:1436
1901
191
>>>>>>> MERGE-SOURCE
1902
139
#, python-format
192
#, python-format
1903
140
msgid "Warning!"
193
msgid "Warning!"
1904
141
msgstr ""
194
msgstr ""
1905
@@ -201,11 +254,46 @@
1906
201
msgstr ""
254
msgstr ""
1907
202
255
1908
203
#. module: account
256
#. module: account
1909
257
<<<<<<< TREE
1910
258
=======
1911
259
#: model:ir.model,name:account.model_account_tax
1912
260
msgid "account.tax"
1913
261
msgstr ""
1914
262
1915
263
#. module: account
1916
264
#: code:addons/account/account.py:915
1917
265
#, python-format
1918
266
msgid "No period defined for this date: %s !\n"
1919
267
"Please create a fiscal year."
1920
268
msgstr ""
1921
269
1922
270
#. module: account
1923
271
>>>>>>> MERGE-SOURCE
1924
204
#: model:ir.model,name:account.model_account_move_line_reconcile_select
272
#: model:ir.model,name:account.model_account_move_line_reconcile_select
1925
205
msgid "Move line reconcile select"
273
msgid "Move line reconcile select"
1926
206
msgstr ""
274
msgstr ""
1927
207
275
1928
208
#. module: account
276
#. module: account
1929
277
<<<<<<< TREE
1930
278
=======
1931
279
#: help:account.model.line,sequence:0
1932
280
msgid "The sequence field is used to order the resources from lower sequences to higher ones"
1933
281
msgstr ""
1934
282
1935
283
#. module: account
1936
284
#: help:account.tax.code,notprintable:0
1937
285
#: help:account.tax.code.template,notprintable:0
1938
286
msgid "Check this box if you don't want any VAT related to this Tax Code to appear on invoices"
1939
287
msgstr ""
1940
288
1941
289
#. module: account
1942
290
#: code:addons/account/invoice.py:1224
1943
291
#, python-format
1944
292
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
1945
293
msgstr ""
1946
294
1947
295
#. module: account
1948
296
>>>>>>> MERGE-SOURCE
1949
209
#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
297
#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
1950
210
msgid "Accounting entries are an input of the reconciliation."
298
msgid "Accounting entries are an input of the reconciliation."
1951
211
msgstr ""
299
msgstr ""
1952
@@ -216,6 +304,7 @@
1953
216
msgstr ""
304
msgstr ""
1954
217
305
1955
218
#. module: account
306
#. module: account
1956
307
<<<<<<< TREE
1957
219
#: model:mail.message.subtype,name:account.mt_invoice_validated
308
#: model:mail.message.subtype,name:account.mt_invoice_validated
1958
220
msgid "Validated"
309
msgid "Validated"
1959
221
msgstr ""
310
msgstr ""
1960
@@ -239,6 +328,16 @@
1961
239
#: help:account.config.settings,module_account_voucher:0
328
#: help:account.config.settings,module_account_voucher:0
1962
240
msgid "This includes all the basic requirements of voucher entries for bank, cash, sales, purchase, expense, contra, etc.\n"
329
msgid "This includes all the basic requirements of voucher entries for bank, cash, sales, purchase, expense, contra, etc.\n"
1963
241
"                This installs the module account_voucher."
330
"                This installs the module account_voucher."
1964
331
=======
1965
332
#: code:addons/account/account_move_line.py:1182
1966
333
#, python-format
1967
334
msgid "You can not add/modify entries in a closed journal."
1968
335
msgstr ""
1969
336
1970
337
#. module: account
1971
338
#: view:account.bank.statement:0
1972
339
msgid "Calculated Balance"
1973
340
>>>>>>> MERGE-SOURCE
1974
242
msgstr ""
341
msgstr ""
1975
243
342
1976
244
#. module: account
343
#. module: account
1977
@@ -257,6 +356,7 @@
1978
257
msgstr ""
356
msgstr ""
1979
258
357
1980
259
#. module: account
358
#. module: account
1981
359
<<<<<<< TREE
1982
260
#: model:ir.actions.act_window,help:account.action_invoice_tree3
360
#: model:ir.actions.act_window,help:account.action_invoice_tree3
1983
261
msgid "<p class=\"oe_view_nocontent_create\">\n"
361
msgid "<p class=\"oe_view_nocontent_create\">\n"
1984
262
"                Click to create a customer refund. \n"
362
"                Click to create a customer refund. \n"
1985
@@ -268,6 +368,21 @@
1986
268
"                can generate it directly from the related customer invoice.\n"
368
"                can generate it directly from the related customer invoice.\n"
1987
269
"              </p>\n"
369
"              </p>\n"
1988
270
"            "
370
"            "
1989
371
=======
1990
372
#: view:account.move.line:0
1991
373
msgid "St."
1992
374
msgstr ""
1993
375
1994
376
#. module: account
1995
377
#: code:addons/account/invoice.py:532
1996
378
#, python-format
1997
379
msgid "Invoice line account company does not match with invoice company."
1998
380
msgstr ""
1999
381
2000
382
#. module: account
2001
383
#: field:account.journal.column,field:0
2002
384
msgid "Field Name"
2003
385
>>>>>>> MERGE-SOURCE
2004
271
msgstr ""
386
msgstr ""
2005
272
387
2006
273
#. module: account
388
#. module: account
2007
@@ -522,9 +637,15 @@
2008
522
msgstr ""
637
msgstr ""
2009
523
638
2010
524
#. module: account
639
#. module: account
2011
640
<<<<<<< TREE
2012
525
#: report:account.general.ledger:0
641
#: report:account.general.ledger:0
2013
526
#: report:account.general.ledger_landscape:0
642
#: report:account.general.ledger_landscape:0
2014
527
msgid "Counterpart"
643
msgid "Counterpart"
2015
644
=======
2016
645
#: code:addons/account/account_cash_statement.py:349
2017
646
#, python-format
2018
647
msgid "CashBox Balance is not matching with Calculated Balance !"
2019
648
>>>>>>> MERGE-SOURCE
2020
528
msgstr ""
649
msgstr ""
2021
529
650
2022
530
#. module: account
651
#. module: account
2023
@@ -597,6 +718,7 @@
2024
597
msgstr ""
718
msgstr ""
2025
598
719
2026
599
#. module: account
720
#. module: account
2027
721
<<<<<<< TREE
2028
600
#: code:addons/account/wizard/account_change_currency.py:64
722
#: code:addons/account/wizard/account_change_currency.py:64
2029
601
#: code:addons/account/wizard/account_change_currency.py:70
723
#: code:addons/account/wizard/account_change_currency.py:70
2030
602
#, python-format
724
#, python-format
2031
@@ -621,6 +743,15 @@
2032
621
743
2033
622
#. module: account
744
#. module: account
2034
623
#: code:addons/account/account.py:3153
745
#: code:addons/account/account.py:3153
2035
746
=======
2036
747
#: field:account.invoice.tax,tax_amount:0
2037
748
msgid "Tax Code Amount"
2038
749
msgstr ""
2039
750
2040
751
#. module: account
2041
752
#: code:addons/account/account.py:2823
2042
753
#: code:addons/account/installer.py:434
2043
754
>>>>>>> MERGE-SOURCE
2044
624
#, python-format
755
#, python-format
2045
625
msgid "SAJ"
756
msgid "SAJ"
2046
626
msgstr ""
757
msgstr ""
2047
@@ -658,6 +789,7 @@
2048
658
msgstr ""
789
msgstr ""
2049
659
790
2050
660
#. module: account
791
#. module: account
2051
792
<<<<<<< TREE
2052
661
#: constraint:account.move:0
793
#: constraint:account.move:0
2053
662
msgid "You cannot create more than one move per period on a centralized journal."
794
msgid "You cannot create more than one move per period on a centralized journal."
2054
663
msgstr ""
795
msgstr ""
2055
@@ -665,6 +797,12 @@
2056
665
#. module: account
797
#. module: account
2057
666
#: help:account.tax,account_analytic_paid_id:0
798
#: help:account.tax,account_analytic_paid_id:0
2058
667
msgid "Set the analytic account that will be used by default on the invoice tax lines for refunds. Leave empty if you don't want to use an analytic account on the invoice tax lines by default."
799
msgid "Set the analytic account that will be used by default on the invoice tax lines for refunds. Leave empty if you don't want to use an analytic account on the invoice tax lines by default."
2059
800
=======
2060
801
#: code:addons/account/account_move_line.py:723
2061
802
#: code:addons/account/account_move_line.py:767
2062
803
#, python-format
2063
804
msgid "To reconcile the entries company should be the same for all entries"
2064
805
>>>>>>> MERGE-SOURCE
2065
668
msgstr ""
806
msgstr ""
2066
669
807
2067
670
#. module: account
808
#. module: account
2068
@@ -749,6 +887,7 @@
2069
749
msgstr ""
887
msgstr ""
2070
750
888
2071
751
#. module: account
889
#. module: account
2072
890
<<<<<<< TREE
2073
752
#: field:account.invoice.refund,filter_refund:0
891
#: field:account.invoice.refund,filter_refund:0
2074
753
msgid "Refund Method"
892
msgid "Refund Method"
2075
754
msgstr ""
893
msgstr ""
2076
@@ -756,6 +895,11 @@
2077
756
#. module: account
895
#. module: account
2078
757
#: model:ir.ui.menu,name:account.menu_account_report
896
#: model:ir.ui.menu,name:account.menu_account_report
2079
758
msgid "Financial Report"
897
msgid "Financial Report"
2080
898
=======
2081
899
#: code:addons/account/wizard/account_change_currency.py:38
2082
900
#, python-format
2083
901
msgid "You can only change currency for Draft Invoice !"
2084
902
>>>>>>> MERGE-SOURCE
2085
759
msgstr ""
903
msgstr ""
2086
760
904
2087
761
#. module: account
905
#. module: account
2088
@@ -882,8 +1026,25 @@
2089
882
msgstr ""
1026
msgstr ""
2090
883
1027
2091
884
#. module: account
1028
#. module: account
2092
1029
<<<<<<< TREE
2093
885
#: field:account.journal.cashbox.line,pieces:0
1030
#: field:account.journal.cashbox.line,pieces:0
2094
886
msgid "Values"
1031
msgid "Values"
2095
1032
=======
2096
1033
#: view:account.move.line:0
2097
1034
msgid "Next Partner to reconcile"
2098
1035
msgstr ""
2099
1036
2100
1037
#. module: account
2101
1038
#: code:addons/account/account_move_line.py:1197
2102
1039
#, python-format
2103
1040
msgid "You can not do this modification on a confirmed entry ! Please note that you can just change some non important fields !"
2104
1041
msgstr ""
2105
1042
2106
1043
#. module: account
2107
1044
#: view:account.invoice.report:0
2108
1045
#: field:account.invoice.report,delay_to_pay:0
2109
1046
msgid "Avg. Delay To Pay"
2110
1047
>>>>>>> MERGE-SOURCE
2111
887
msgstr ""
1048
msgstr ""
2112
888
1049
2113
889
#. module: account
1050
#. module: account
2114
@@ -900,6 +1061,7 @@
2115
900
1061
2116
901
#. module: account
1062
#. module: account
2117
902
#: report:account.overdue:0
1063
#: report:account.overdue:0
2118
1064
#: report:account.aged_trial_balance:0
2119
903
msgid "Due"
1065
msgid "Due"
2120
904
msgstr ""
1066
msgstr ""
2121
905
1067
2122
@@ -1005,10 +1167,15 @@
2123
1005
#: field:account.journal,code:0
1167
#: field:account.journal,code:0
2124
1006
#: report:account.partner.balance:0
1168
#: report:account.partner.balance:0
2125
1007
#: field:account.period,code:0
1169
#: field:account.period,code:0
2126
1170
#: report:account.balancesheet.horizontal:0
2127
1171
#: report:account.balancesheet:0
2128
1172
#: report:pl.account.horizontal:0
2129
1173
#: report:pl.account:0
2130
1008
msgid "Code"
1174
msgid "Code"
2131
1009
msgstr ""
1175
msgstr ""
2132
1010
1176
2133
1011
#. module: account
1177
#. module: account
2134
1178
<<<<<<< TREE
2135
1012
#: view:account.config.settings:0
1179
#: view:account.config.settings:0
2136
1013
msgid "Features"
1180
msgid "Features"
2137
1014
msgstr ""
1181
msgstr ""
2138
@@ -1019,6 +1186,14 @@
2139
1019
#: code:addons/account/account_invoice.py:73
1186
#: code:addons/account/account_invoice.py:73
2140
1020
#: code:addons/account/account_invoice.py:748
1187
#: code:addons/account/account_invoice.py:748
2141
1021
#: code:addons/account/account_move_line.py:195
1188
#: code:addons/account/account_move_line.py:195
2142
1189
=======
2143
1190
#: code:addons/account/account.py:2097
2144
1191
#: code:addons/account/account_bank_statement.py:350
2145
1192
#: code:addons/account/account_move_line.py:169
2146
1193
#: code:addons/account/invoice.py:73
2147
1194
#: code:addons/account/invoice.py:678
2148
1195
#: code:addons/account/wizard/account_use_model.py:81
2149
1196
>>>>>>> MERGE-SOURCE
2150
1022
#, python-format
1197
#, python-format
2151
1023
msgid "No Analytic Journal !"
1198
msgid "No Analytic Journal !"
2152
1024
msgstr ""
1199
msgstr ""
2153
@@ -1109,6 +1284,7 @@
2154
1109
msgstr ""
1284
msgstr ""
2155
1110
1285
2156
1111
#. module: account
1286
#. module: account
2157
1287
<<<<<<< TREE
2158
1112
#: field:account.config.settings,sale_refund_journal_id:0
1288
#: field:account.config.settings,sale_refund_journal_id:0
2159
1113
msgid "Sale refund journal"
1289
msgid "Sale refund journal"
2160
1114
msgstr ""
1290
msgstr ""
2161
@@ -1129,6 +1305,30 @@
2162
1129
1305
2163
1130
#. module: account
1306
#. module: account
2164
1131
#: model:account.account.type,name:account.data_account_type_bank
1307
#: model:account.account.type,name:account.data_account_type_bank
2165
1308
=======
2166
1309
#: selection:account.account.type,report_type:0
2167
1310
msgid "Profit & Loss (Expense Accounts)"
2168
1311
msgstr ""
2169
1312
2170
1313
#. module: account
2171
1314
#: report:account.analytic.account.journal:0
2172
1315
#: report:account.third_party_ledger:0
2173
1316
#: report:account.third_party_ledger_other:0
2174
1317
msgid "-"
2175
1318
msgstr ""
2176
1319
2177
1320
#. module: account
2178
1321
#: view:account.analytic.account:0
2179
1322
msgid "Manager"
2180
1323
msgstr ""
2181
1324
2182
1325
#. module: account
2183
1326
#: view:account.subscription.generate:0
2184
1327
msgid "Generate Entries before:"
2185
1328
msgstr ""
2186
1329
2187
1330
#. module: account
2188
1331
>>>>>>> MERGE-SOURCE
2189
1132
#: selection:account.bank.accounts.wizard,account_type:0
1332
#: selection:account.bank.accounts.wizard,account_type:0
2190
1133
#: code:addons/account/account.py:3044
1333
#: code:addons/account/account.py:3044
2191
1134
#, python-format
1334
#, python-format
2192
@@ -1233,13 +1433,27 @@
2193
1233
1433
2194
1234
#. module: account
1434
#. module: account
2195
1235
#: report:account.general.ledger:0
1435
#: report:account.general.ledger:0
2197
1236
#: report:account.general.ledger_landscape:0
1436
<<<<<<< TREE
2198
1437
#: report:account.general.ledger_landscape:0
2199
1438
=======
2200
1439
#: report:account.general.ledger_landscape:0
2201
1440
#: report:account.tax.code.entries:0
2202
1441
>>>>>>> MERGE-SOURCE
2203
1237
#: report:account.third_party_ledger:0
1442
#: report:account.third_party_ledger:0
2204
1238
#: report:account.third_party_ledger_other:0
1443
#: report:account.third_party_ledger_other:0
2205
1239
msgid "Entry Label"
1444
msgid "Entry Label"
2206
1240
msgstr ""
1445
msgstr ""
2207
1241
1446
2208
1242
#. module: account
1447
#. module: account
2209
1448
<<<<<<< TREE
2210
1449
=======
2211
1450
#: code:addons/account/account.py:990
2212
1451
#, python-format
2213
1452
msgid "You can not modify/delete a journal with entries for this period !"
2214
1453
msgstr ""
2215
1454
2216
1455
#. module: account
2217
1456
>>>>>>> MERGE-SOURCE
2218
1243
#: help:account.invoice,origin:0
1457
#: help:account.invoice,origin:0
2219
1244
#: help:account.invoice.line,origin:0
1458
#: help:account.invoice.line,origin:0
2220
1245
msgid "Reference of the document that produced this invoice."
1459
msgid "Reference of the document that produced this invoice."
2221
@@ -1391,6 +1605,7 @@
2222
1391
1605
2223
1392
#. module: account
1606
#. module: account
2224
1393
#: model:ir.ui.menu,name:account.next_id_22
1607
#: model:ir.ui.menu,name:account.next_id_22
2225
1608
#: report:account.aged_trial_balance:0
2226
1394
msgid "Partners"
1609
msgid "Partners"
2227
1395
msgstr ""
1610
msgstr ""
2228
1396
1611
2229
@@ -1420,9 +1635,18 @@
2230
1420
msgstr ""
1635
msgstr ""
2231
1421
1636
2232
1422
#. module: account
1637
#. module: account
2233
1638
<<<<<<< TREE
2234
1423
#: code:addons/account/account.py:612
1639
#: code:addons/account/account.py:612
2235
1424
#: code:addons/account/account.py:767
1640
#: code:addons/account/account.py:767
2236
1425
#: code:addons/account/account.py:768
1641
#: code:addons/account/account.py:768
2237
1642
=======
2238
1643
#: model:ir.actions.report.xml,name:account.account_central_journal
2239
1644
msgid "Central Journal"
2240
1645
msgstr ""
2241
1646
2242
1647
#. module: account
2243
1648
#: code:addons/account/account_move_line.py:1277
2244
1649
>>>>>>> MERGE-SOURCE
2245
1426
#, python-format
1650
#, python-format
2246
1427
msgid "%s (copy)"
1651
msgid "%s (copy)"
2247
1428
msgstr ""
1652
msgstr ""
2248
@@ -1531,6 +1755,7 @@
2249
1531
msgstr ""
1755
msgstr ""
2250
1532
1756
2251
1533
#. module: account
1757
#. module: account
2252
1758
<<<<<<< TREE
2253
1534
#: field:account.tax.code,code:0
1759
#: field:account.tax.code,code:0
2254
1535
#: field:account.tax.code.template,code:0
1760
#: field:account.tax.code.template,code:0
2255
1536
msgid "Case Code"
1761
msgid "Case Code"
2256
@@ -1539,17 +1764,28 @@
2257
1539
#. module: account
1764
#. module: account
2258
1540
#: field:account.config.settings,company_footer:0
1765
#: field:account.config.settings,company_footer:0
2259
1541
msgid "Bank accounts footer preview"
1766
msgid "Bank accounts footer preview"
2271
1542
msgstr ""
1767
=======
2272
1543
1768
#: view:account.payment.term.line:0
2273
1544
#. module: account
1769
msgid "Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
2274
1545
#: selection:account.account,type:0
1770
msgstr ""
2275
1546
#: selection:account.account.template,type:0
1771
2276
1547
#: selection:account.bank.statement,state:0
1772
#. module: account
2277
1548
#: selection:account.entries.report,type:0
1773
#: code:addons/account/invoice.py:823
2278
1549
#: view:account.fiscalyear:0
1774
#, python-format
2279
1550
#: selection:account.fiscalyear,state:0
1775
msgid "Cannot create the invoice !\n"
2280
1551
#: selection:account.period,state:0
1776
"The payment term defined gives a computed amount greater than the total invoiced amount."
2281
1552
msgid "Closed"
1777
msgstr ""
2282
1778
2283
1779
#. module: account
2284
1780
#: field:account.installer.modules,account_anglo_saxon:0
2285
1781
msgid "Anglo-Saxon Accounting"
2286
1782
>>>>>>> MERGE-SOURCE
2287
1783
msgstr ""
2288
1784
2289
1785
#. module: account
2290
1786
#: view:account.automatic.reconcile:0
2291
1787
#: view:account.move.line.reconcile.writeoff:0
2292
1788
msgid "Write-Off Move"
2293
1553
msgstr ""
1789
msgstr ""
2294
1554
1790
2295
1555
#. module: account
1791
#. module: account
2296
@@ -1673,8 +1909,18 @@
2297
1673
msgstr ""
1909
msgstr ""
2298
1674
1910
2299
1675
#. module: account
1911
#. module: account
2300
1912
<<<<<<< TREE
2301
1676
#: field:account.config.settings,group_analytic_accounting:0
1913
#: field:account.config.settings,group_analytic_accounting:0
2302
1677
msgid "Analytic accounting"
1914
msgid "Analytic accounting"
2303
1915
=======
2304
1916
#: field:wizard.multi.charts.accounts,seq_journal:0
2305
1917
msgid "Separated Journal Sequences"
2306
1918
msgstr ""
2307
1919
2308
1920
#. module: account
2309
1921
#: view:account.invoice:0
2310
1922
msgid "Responsible"
2311
1923
>>>>>>> MERGE-SOURCE
2312
1678
msgstr ""
1924
msgstr ""
2313
1679
1925
2314
1680
#. module: account
1926
#. module: account
2315
@@ -1733,6 +1979,7 @@
2316
1733
msgstr ""
1979
msgstr ""
2317
1734
1980
2318
1735
#. module: account
1981
#. module: account
2319
1982
<<<<<<< TREE
2320
1736
#: view:account.installer:0
1983
#: view:account.installer:0
2321
1737
msgid "Select a configuration package to setup automatically your\n"
1984
msgid "Select a configuration package to setup automatically your\n"
2322
1738
"                        taxes and chart of accounts."
1985
"                        taxes and chart of accounts."
2323
@@ -1752,6 +1999,26 @@
2324
1752
#: report:account.journal.period.print.sale.purchase:0
1999
#: report:account.journal.period.print.sale.purchase:0
2325
1753
#: view:account.tax.template:0
2000
#: view:account.tax.template:0
2326
1754
msgid "Tax Declaration"
2001
msgid "Tax Declaration"
2327
2002
=======
2328
2003
#: model:ir.actions.act_window,help:account.action_account_chart
2329
2004
msgid "Display your company chart of accounts per fiscal year and filter by period. Have a complete tree view of all journal items per account code by clicking on an account."
2330
2005
msgstr ""
2331
2006
2332
2007
#. module: account
2333
2008
#: constraint:account.fiscalyear:0
2334
2009
msgid "Error! You cannot define overlapping fiscal years"
2335
2010
msgstr ""
2336
2011
2337
2012
#. module: account
2338
2013
#: code:addons/account/account_move_line.py:799
2339
2014
#, python-format
2340
2015
msgid "The account is not defined to be reconciled !"
2341
2016
msgstr ""
2342
2017
2343
2018
#. module: account
2344
2019
#: field:account.cashbox.line,pieces:0
2345
2020
msgid "Values"
2346
2021
>>>>>>> MERGE-SOURCE
2347
1755
msgstr ""
2022
msgstr ""
2348
1756
2023
2349
1757
#. module: account
2024
#. module: account
2350
@@ -1770,6 +2037,7 @@
2351
1770
msgstr ""
2037
msgstr ""
2352
1771
2038
2353
1772
#. module: account
2039
#. module: account
2354
2040
<<<<<<< TREE
2355
1773
#: field:account.config.settings,module_account_payment:0
2041
#: field:account.config.settings,module_account_payment:0
2356
1774
msgid "Manage payment orders"
2042
msgid "Manage payment orders"
2357
1775
msgstr ""
2043
msgstr ""
2358
@@ -1783,6 +2051,11 @@
2359
1783
#: view:account.bank.statement:0
2051
#: view:account.bank.statement:0
2360
1784
#: field:account.bank.statement,last_closing_balance:0
2052
#: field:account.bank.statement,last_closing_balance:0
2361
1785
msgid "Last Closing Balance"
2053
msgid "Last Closing Balance"
2362
2054
=======
2363
2055
#: code:addons/account/account_move_line.py:806
2364
2056
#, python-format
2365
2057
msgid "You have to provide an account for the write off entry !"
2366
2058
>>>>>>> MERGE-SOURCE
2367
1786
msgstr ""
2059
msgstr ""
2368
1787
2060
2369
1788
#. module: account
2061
#. module: account
2370
@@ -1806,6 +2079,7 @@
2371
1806
msgstr ""
2079
msgstr ""
2372
1807
2080
2373
1808
#. module: account
2081
#. module: account
2374
2082
<<<<<<< TREE
2375
1809
#: help:account.tax,base_code_id:0
2083
#: help:account.tax,base_code_id:0
2376
1810
#: help:account.tax,ref_base_code_id:0
2084
#: help:account.tax,ref_base_code_id:0
2377
1811
#: help:account.tax,ref_tax_code_id:0
2085
#: help:account.tax,ref_tax_code_id:0
2378
@@ -1815,6 +2089,11 @@
2379
1815
#: help:account.tax.template,ref_tax_code_id:0
2089
#: help:account.tax.template,ref_tax_code_id:0
2380
1816
#: help:account.tax.template,tax_code_id:0
2090
#: help:account.tax.template,tax_code_id:0
2381
1817
msgid "Use this code for the tax declaration."
2091
msgid "Use this code for the tax declaration."
2382
2092
=======
2383
2093
#: code:addons/account/account_cash_statement.py:329
2384
2094
#, python-format
2385
2095
msgid "User %s does not have rights to access %s journal !"
2386
2096
>>>>>>> MERGE-SOURCE
2387
1818
msgstr ""
2097
msgstr ""
2388
1819
2098
2389
1820
#. module: account
2099
#. module: account
2390
@@ -1833,8 +2112,14 @@
2391
1833
msgstr ""
2112
msgstr ""
2392
1834
2113
2393
1835
#. module: account
2114
#. module: account
2394
2115
<<<<<<< TREE
2395
1836
#: field:account.config.settings,module_account_check_writing:0
2116
#: field:account.config.settings,module_account_check_writing:0
2396
1837
msgid "Pay your suppliers by check"
2117
msgid "Pay your suppliers by check"
2397
2118
=======
2398
2119
#: code:addons/account/account.py:509
2399
2120
#, python-format
2400
2121
msgid "You cannot deactivate an account that contains account moves."
2401
2122
>>>>>>> MERGE-SOURCE
2402
1838
msgstr ""
2123
msgstr ""
2403
1839
2124
2404
1840
#. module: account
2125
#. module: account
2405
@@ -1843,6 +2128,7 @@
2406
1843
msgstr ""
2128
msgstr ""
2407
1844
2129
2408
1845
#. module: account
2130
#. module: account
2409
2131
<<<<<<< TREE
2410
1846
#: field:account.bank.statement,message_ids:0
2132
#: field:account.bank.statement,message_ids:0
2411
1847
#: field:account.invoice,message_ids:0
2133
#: field:account.invoice,message_ids:0
2412
1848
msgid "Messages"
2134
msgid "Messages"
2413
@@ -1905,6 +2191,14 @@
2414
1905
#: code:addons/account/wizard/account_use_model.py:44
2191
#: code:addons/account/wizard/account_use_model.py:44
2415
1906
#: code:addons/account/wizard/pos_box.py:32
2192
#: code:addons/account/wizard/pos_box.py:32
2416
1907
#: code:addons/account/wizard/pos_box.py:36
2193
#: code:addons/account/wizard/pos_box.py:36
2417
2194
=======
2418
2195
#: constraint:account.move.line:0
2419
2196
msgid "You can not create move line on closed account."
2420
2197
msgstr ""
2421
2198
2422
2199
#. module: account
2423
2200
#: code:addons/account/account.py:529
2424
2201
>>>>>>> MERGE-SOURCE
2425
1908
#, python-format
2202
#, python-format
2426
1909
msgid "Error!"
2203
msgid "Error!"
2427
1910
msgstr ""
2204
msgstr ""
2428
@@ -2089,6 +2383,7 @@
2429
2089
msgstr ""
2383
msgstr ""
2430
2090
2384
2431
2091
#. module: account
2385
#. module: account
2432
2386
<<<<<<< TREE
2433
2092
#. openerp-web
2387
#. openerp-web
2434
2093
#: code:addons/account/static/src/xml/account_move_reconciliation.xml:8
2388
#: code:addons/account/static/src/xml/account_move_reconciliation.xml:8
2435
2094
#, python-format
2389
#, python-format
2436
@@ -2118,6 +2413,20 @@
2437
2118
msgstr ""
2413
msgstr ""
2438
2119
2414
2439
2120
#. module: account
2415
#. module: account
2440
2416
=======
2441
2417
#: model:ir.actions.act_window,name:account.action_account_pl_report
2442
2418
msgid "Account Profit And Loss"
2443
2419
msgstr ""
2444
2420
2445
2421
#. module: account
2446
2422
#: field:account.installer,config_logo:0
2447
2423
#: field:account.installer.modules,config_logo:0
2448
2424
#: field:wizard.multi.charts.accounts,config_logo:0
2449
2425
msgid "Image"
2450
2426
msgstr ""
2451
2427
2452
2428
#. module: account
2453
2429
>>>>>>> MERGE-SOURCE
2454
2121
#: view:account.invoice:0
2430
#: view:account.invoice:0
2455
2122
#: view:report.invoice.created:0
2431
#: view:report.invoice.created:0
2456
2123
msgid "Untaxed Amount"
2432
msgid "Untaxed Amount"
2457
@@ -2244,6 +2553,23 @@
2458
2244
msgstr ""
2553
msgstr ""
2459
2245
2554
2460
2246
#. module: account
2555
#. module: account
2461
2556
<<<<<<< TREE
2462
2557
=======
2463
2558
#: code:addons/account/installer.py:348
2464
2559
#, python-format
2465
2560
msgid " Journal"
2466
2561
msgstr ""
2467
2562
2468
2563
#. module: account
2469
2564
#: code:addons/account/account.py:1333
2470
2565
#, python-format
2471
2566
msgid "There is no default default debit account defined \n"
2472
2567
"on journal \"%s\""
2473
2568
msgstr ""
2474
2569
2475
2570
#. module: account
2476
2571
#: help:account.account,type:0
2477
2572
>>>>>>> MERGE-SOURCE
2478
2247
#: help:account.account.template,type:0
2573
#: help:account.account.template,type:0
2479
2248
#: help:account.entries.report,type:0
2574
#: help:account.entries.report,type:0
2480
2249
msgid "This type is used to differentiate types with special effects in OpenERP: view can not have entries, consolidation are accounts that can have children accounts for multi-company consolidations, payable/receivable are for partners accounts (for debit/credit computations), closed for depreciated accounts."
2575
msgid "This type is used to differentiate types with special effects in OpenERP: view can not have entries, consolidation are accounts that can have children accounts for multi-company consolidations, payable/receivable are for partners accounts (for debit/credit computations), closed for depreciated accounts."
2481
@@ -2277,9 +2603,16 @@
2482
2277
msgstr ""
2603
msgstr ""
2483
2278
2604
2484
2279
#. module: account
2605
#. module: account
2485
2606
<<<<<<< TREE
2486
2280
#: field:account.tax,price_include:0
2607
#: field:account.tax,price_include:0
2487
2281
#: field:account.tax.template,price_include:0
2608
#: field:account.tax.template,price_include:0
2488
2282
msgid "Tax Included in Price"
2609
msgid "Tax Included in Price"
2489
2610
=======
2490
2611
#: code:addons/account/account.py:2888
2491
2612
#: code:addons/account/installer.py:498
2492
2613
#, python-format
2493
2614
msgid "ECNJ"
2494
2615
>>>>>>> MERGE-SOURCE
2495
2283
msgstr ""
2616
msgstr ""
2496
2284
2617
2497
2285
#. module: account
2618
#. module: account
2498
@@ -2296,12 +2629,27 @@
2499
2296
msgstr ""
2629
msgstr ""
2500
2297
2630
2501
2298
#. module: account
2631
#. module: account
2502
2632
<<<<<<< TREE
2503
2299
#: help:account.config.settings,default_sale_tax:0
2633
#: help:account.config.settings,default_sale_tax:0
2504
2300
msgid "This sale tax will be assigned by default on new products."
2634
msgid "This sale tax will be assigned by default on new products."
2505
2301
msgstr ""
2635
msgstr ""
2506
2302
2636
2507
2303
#. module: account
2637
#. module: account
2508
2304
#: report:account.general.ledger_landscape:0
2638
#: report:account.general.ledger_landscape:0
2509
2639
=======
2510
2640
#: code:addons/account/invoice.py:351
2511
2641
#, python-format
2512
2642
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
2513
2643
msgstr ""
2514
2644
2515
2645
#. module: account
2516
2646
#: view:product.category:0
2517
2647
msgid "Accounting Properties"
2518
2648
msgstr ""
2519
2649
2520
2650
#. module: account
2521
2651
#: report:account.general.ledger_landscape:0
2522
2652
>>>>>>> MERGE-SOURCE
2523
2305
#: report:account.journal.period.print:0
2653
#: report:account.journal.period.print:0
2524
2306
#: report:account.journal.period.print.sale.purchase:0
2654
#: report:account.journal.period.print.sale.purchase:0
2525
2307
msgid "Entries Sorted By"
2655
msgid "Entries Sorted By"
2526
@@ -2359,6 +2707,11 @@
2527
2359
#: field:accounting.report,fiscalyear_id:0
2707
#: field:accounting.report,fiscalyear_id:0
2528
2360
#: field:accounting.report,fiscalyear_id_cmp:0
2708
#: field:accounting.report,fiscalyear_id_cmp:0
2529
2361
#: model:ir.model,name:account.model_account_fiscalyear
2709
#: model:ir.model,name:account.model_account_fiscalyear
2530
2710
#: report:account.balancesheet.horizontal:0
2531
2711
#: report:account.balancesheet:0
2532
2712
#: report:pl.account.horizontal:0
2533
2713
#: report:pl.account:0
2534
2714
#: report:account.aged_trial_balance:0
2535
2362
msgid "Fiscal Year"
2715
msgid "Fiscal Year"
2536
2363
msgstr ""
2716
msgstr ""
2537
2364
2717
2538
@@ -2486,6 +2839,7 @@
2539
2486
msgstr ""
2839
msgstr ""
2540
2487
2840
2541
2488
#. module: account
2841
#. module: account
2542
2842
<<<<<<< TREE
2543
2489
#: model:account.payment.term,name:account.account_payment_term_advance
2843
#: model:account.payment.term,name:account.account_payment_term_advance
2544
2490
#: model:account.payment.term,note:account.account_payment_term_advance
2844
#: model:account.payment.term,note:account.account_payment_term_advance
2545
2491
msgid "30% Advance End 30 Days"
2845
msgid "30% Advance End 30 Days"
2546
@@ -2494,6 +2848,14 @@
2547
2494
#. module: account
2848
#. module: account
2548
2495
#: view:account.entries.report:0
2849
#: view:account.entries.report:0
2549
2496
msgid "Unreconciled entries"
2850
msgid "Unreconciled entries"
2550
2851
=======
2551
2852
#: code:addons/account/invoice.py:552
2552
2853
#, python-format
2553
2854
msgid "Can't find any account journal of %s type for this company.\n"
2554
2855
"\n"
2555
2856
"You can create one in the menu: \n"
2556
2857
"Configuration\\Financial Accounting\\Accounts\\Journals."
2557
2858
>>>>>>> MERGE-SOURCE
2558
2497
msgstr ""
2859
msgstr ""
2559
2498
2860
2560
2499
#. module: account
2861
#. module: account
2561
@@ -2546,7 +2908,12 @@
2562
2546
msgstr ""
2908
msgstr ""
2563
2547
2909
2564
2548
#. module: account
2910
#. module: account
2565
2911
<<<<<<< TREE
2566
2549
#: code:addons/account/account.py:3154
2912
#: code:addons/account/account.py:3154
2567
2913
=======
2568
2914
#: code:addons/account/account.py:2840
2569
2915
#: code:addons/account/installer.py:454
2570
2916
>>>>>>> MERGE-SOURCE
2571
2550
#, python-format
2917
#, python-format
2572
2551
msgid "EXJ"
2918
msgid "EXJ"
2573
2552
msgstr ""
2919
msgstr ""
2574
@@ -2650,6 +3017,7 @@
2575
2650
msgstr ""
3017
msgstr ""
2576
2651
3018
2577
2652
#. module: account
3019
#. module: account
2578
3020
<<<<<<< TREE
2579
2653
#: code:addons/account/account.py:3493
3021
#: code:addons/account/account.py:3493
2580
2654
#: code:addons/account/account_bank_statement.py:404
3022
#: code:addons/account/account_bank_statement.py:404
2581
2655
#: code:addons/account/account_invoice.py:386
3023
#: code:addons/account/account_invoice.py:386
2582
@@ -2659,6 +3027,9 @@
2583
2659
#: code:addons/account/account_invoice.py:609
3027
#: code:addons/account/account_invoice.py:609
2584
2660
#: code:addons/account/account_invoice.py:631
3028
#: code:addons/account/account_invoice.py:631
2585
2661
#: code:addons/account/account_move_line.py:535
3029
#: code:addons/account/account_move_line.py:535
2586
3030
=======
2587
3031
#: code:addons/account/invoice.py:350
2588
3032
>>>>>>> MERGE-SOURCE
2589
2662
#, python-format
3033
#, python-format
2590
2663
msgid "Configuration Error!"
3034
msgid "Configuration Error!"
2591
2664
msgstr ""
3035
msgstr ""
2592
@@ -2681,6 +3052,15 @@
2593
2681
msgstr ""
3052
msgstr ""
2594
2682
3053
2595
2683
#. module: account
3054
#. module: account
2596
3055
<<<<<<< TREE
2597
3056
=======
2598
3057
#: code:addons/account/account.py:654
2599
3058
#, python-format
2600
3059
msgid "You cannot modify company of this journal as its related record exist in Entry Lines"
2601
3060
msgstr ""
2602
3061
2603
3062
#. module: account
2604
3063
>>>>>>> MERGE-SOURCE
2605
2684
#: report:account.journal.period.print:0
3064
#: report:account.journal.period.print:0
2606
2685
#: report:account.journal.period.print.sale.purchase:0
3065
#: report:account.journal.period.print.sale.purchase:0
2607
2686
msgid "Label"
3066
msgid "Label"
2608
@@ -2710,7 +3090,12 @@
2609
2710
3090
2610
2711
#. module: account
3091
#. module: account
2611
2712
#: report:account.general.ledger:0
3092
#: report:account.general.ledger:0
2613
2713
#: report:account.general.ledger_landscape:0
3093
<<<<<<< TREE
2614
3094
#: report:account.general.ledger_landscape:0
2615
3095
=======
2616
3096
#: report:account.general.ledger_landscape:0
2617
3097
#: report:account.journal.period.print:0
2618
3098
>>>>>>> MERGE-SOURCE
2619
2714
#: report:account.overdue:0
3099
#: report:account.overdue:0
2620
2715
#: report:account.third_party_ledger:0
3100
#: report:account.third_party_ledger:0
2621
2716
#: report:account.third_party_ledger_other:0
3101
#: report:account.third_party_ledger_other:0
2622
@@ -2855,8 +3240,18 @@
2623
2855
msgstr ""
3240
msgstr ""
2624
2856
3241
2625
2857
#. module: account
3242
#. module: account
2626
3243
<<<<<<< TREE
2627
2858
#: code:addons/account/account.py:1411
3244
#: code:addons/account/account.py:1411
2628
3245
=======
2629
3246
#: view:account.use.model:0
2630
3247
msgid "This wizard will create recurring accounting entries"
2631
3248
msgstr ""
2632
3249
2633
3250
#. module: account
2634
3251
#: code:addons/account/account.py:1195
2635
3252
>>>>>>> MERGE-SOURCE
2636
2859
#, python-format
3253
#, python-format
2637
3254
<<<<<<< TREE
2638
2860
msgid "You cannot delete a posted journal entry \"%s\"."
3255
msgid "You cannot delete a posted journal entry \"%s\"."
2639
2861
msgstr ""
3256
msgstr ""
2640
2862
3257
2641
@@ -2874,6 +3269,17 @@
2642
2874
#: code:addons/account/account.py:2298
3269
#: code:addons/account/account.py:2298
2643
2875
#: code:addons/account/account_invoice.py:748
3270
#: code:addons/account/account_invoice.py:748
2644
2876
#: code:addons/account/account_move_line.py:195
3271
#: code:addons/account/account_move_line.py:195
2645
3272
=======
2646
3273
msgid "No sequence defined on the journal !"
2647
3274
msgstr ""
2648
3275
2649
3276
#. module: account
2650
3277
#: code:addons/account/account.py:2097
2651
3278
#: code:addons/account/account_bank_statement.py:350
2652
3279
#: code:addons/account/account_move_line.py:169
2653
3280
#: code:addons/account/invoice.py:678
2654
3281
#: code:addons/account/wizard/account_use_model.py:81
2655
3282
>>>>>>> MERGE-SOURCE
2656
2877
#, python-format
3283
#, python-format
2657
2878
msgid "You have to define an analytic journal on the '%s' journal!"
3284
msgid "You have to define an analytic journal on the '%s' journal!"
2658
2879
msgstr ""
3285
msgstr ""
2659
@@ -2924,8 +3330,24 @@
2660
2924
msgstr ""
3330
msgstr ""
2661
2925
3331
2662
2926
#. module: account
3332
#. module: account
2663
3333
<<<<<<< TREE
2664
2927
#: field:accounting.report,debit_credit:0
3334
#: field:accounting.report,debit_credit:0
2665
2928
msgid "Display Debit/Credit Columns"
3335
msgid "Display Debit/Credit Columns"
2666
3336
=======
2667
3337
#: code:addons/account/account_bank_statement.py:307
2668
3338
#, python-format
2669
3339
msgid "The expected balance (%.2f) is different than the computed one. (%.2f)"
2670
3340
msgstr ""
2671
3341
2672
3342
#. module: account
2673
3343
#: model:process.transition,note:account.process_transition_paymentreconcile0
2674
3344
msgid "Payment entries are the second input of the reconciliation."
2675
3345
msgstr ""
2676
3346
2677
3347
#. module: account
2678
3348
#: selection:account.print.journal,sort_selection:0
2679
3349
msgid "Reference Number"
2680
3350
>>>>>>> MERGE-SOURCE
2681
2929
msgstr ""
3351
msgstr ""
2682
2930
3352
2683
2931
#. module: account
3353
#. module: account
2684
@@ -3021,6 +3443,7 @@
2685
3021
msgstr ""
3443
msgstr ""
2686
3022
3444
2687
3023
#. module: account
3445
#. module: account
2688
3446
<<<<<<< TREE
2689
3024
#: code:addons/account/account_invoice.py:795
3447
#: code:addons/account/account_invoice.py:795
2690
3025
#, python-format
3448
#, python-format
2691
3026
msgid "Tax base different!\n"
3449
msgid "Tax base different!\n"
2692
@@ -3050,6 +3473,24 @@
2693
3050
#: code:addons/account/account.py:431
3473
#: code:addons/account/account.py:431
2694
3051
#, python-format
3474
#, python-format
2695
3052
msgid "Unable to adapt the initial balance (negative value)."
3475
msgid "Unable to adapt the initial balance (negative value)."
2696
3476
=======
2697
3477
#: help:account.partner.ledger,initial_balance:0
2698
3478
#: help:account.report.general.ledger,initial_balance:0
2699
3479
msgid "It adds initial balance row on report which display previous sum amount of debit/credit/balance"
2700
3480
msgstr ""
2701
3481
2702
3482
#. module: account
2703
3483
#: view:account.analytic.line:0
2704
3484
#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
2705
3485
msgid "Analytic Entries"
2706
3486
msgstr ""
2707
3487
2708
3488
#. module: account
2709
3489
#: code:addons/account/account.py:836
2710
3490
#, python-format
2711
3491
msgid "No fiscal year defined for this date !\n"
2712
3492
"Please create one."
2713
3493
>>>>>>> MERGE-SOURCE
2714
3053
msgstr ""
3494
msgstr ""
2715
3054
3495
2716
3055
#. module: account
3496
#. module: account
2717
@@ -3170,8 +3611,13 @@
2718
3170
msgstr ""
3611
msgstr ""
2719
3171
3612
2720
3172
#. module: account
3613
#. module: account
2721
3614
<<<<<<< TREE
2722
3173
#: code:addons/account/account.py:3412
3615
#: code:addons/account/account.py:3412
2723
3174
#: code:addons/account/account_bank.py:95
3616
#: code:addons/account/account_bank.py:95
2724
3617
=======
2725
3618
#: code:addons/account/account.py:2950
2726
3619
#: code:addons/account/installer.py:296
2727
3620
>>>>>>> MERGE-SOURCE
2728
3175
#, python-format
3621
#, python-format
2729
3176
msgid "BNK"
3622
msgid "BNK"
2730
3177
msgstr ""
3623
msgstr ""
2731
@@ -3325,6 +3771,16 @@
2732
3325
msgstr ""
3771
msgstr ""
2733
3326
3772
2734
3327
#. module: account
3773
#. module: account
2735
3774
<<<<<<< TREE
2736
3775
=======
2737
3776
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
2738
3777
#, python-format
2739
3778
msgid "No End of year journal defined for the fiscal year"
2740
3779
msgstr ""
2741
3780
2742
3781
#. module: account
2743
3782
#: view:account.tax:0
2744
3783
>>>>>>> MERGE-SOURCE
2745
3328
#: view:account.tax.template:0
3784
#: view:account.tax.template:0
2746
3329
msgid "Keep empty to use the expense account"
3785
msgid "Keep empty to use the expense account"
2747
3330
msgstr ""
3786
msgstr ""
2748
@@ -3341,8 +3797,12 @@
2749
3341
#: field:account.common.report,journal_ids:0
3797
#: field:account.common.report,journal_ids:0
2750
3342
#: report:account.general.journal:0
3798
#: report:account.general.journal:0
2751
3343
#: field:account.general.journal,journal_ids:0
3799
#: field:account.general.journal,journal_ids:0
2752
3800
<<<<<<< TREE
2753
3344
#: report:account.general.ledger:0
3801
#: report:account.general.ledger:0
2754
3345
#: report:account.general.ledger_landscape:0
3802
#: report:account.general.ledger_landscape:0
2755
3803
=======
2756
3804
#: report:account.general.ledger_landscape:0
2757
3805
>>>>>>> MERGE-SOURCE
2758
3346
#: view:account.journal.period:0
3806
#: view:account.journal.period:0
2759
3347
#: report:account.partner.balance:0
3807
#: report:account.partner.balance:0
2760
3348
#: field:account.partner.balance,journal_ids:0
3808
#: field:account.partner.balance,journal_ids:0
2761
@@ -3415,7 +3875,11 @@
2762
3415
msgstr ""
3875
msgstr ""
2763
3416
3876
2764
3417
#. module: account
3877
#. module: account
2765
3878
<<<<<<< TREE
2766
3418
#: code:addons/account/account_invoice.py:1428
3879
#: code:addons/account/account_invoice.py:1428
2767
3880
=======
2768
3881
#: code:addons/account/invoice.py:1298
2769
3882
>>>>>>> MERGE-SOURCE
2770
3419
#, python-format
3883
#, python-format
2771
3420
msgid "No Partner Defined !"
3884
msgid "No Partner Defined !"
2772
3421
msgstr ""
3885
msgstr ""
2773
@@ -3454,6 +3918,7 @@
2774
3454
msgstr ""
3918
msgstr ""
2775
3455
3919
2776
3456
#. module: account
3920
#. module: account
2777
3921
<<<<<<< TREE
2778
3457
#: help:account.config.settings,paypal_account:0
3922
#: help:account.config.settings,paypal_account:0
2779
3458
msgid "Paypal account (email) for receiving online payments (credit card, etc.) If you set a paypal account, the customer  will be able to pay your invoices or quotations with a button \"Pay with  Paypal\" in automated emails or through the OpenERP portal."
3923
msgid "Paypal account (email) for receiving online payments (credit card, etc.) If you set a paypal account, the customer  will be able to pay your invoices or quotations with a button \"Pay with  Paypal\" in automated emails or through the OpenERP portal."
2780
3459
msgstr ""
3924
msgstr ""
2781
@@ -3472,6 +3937,24 @@
2782
3472
#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
3937
#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
2783
3473
#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
3938
#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
2784
3474
msgid "Unreconcile Entries"
3939
msgid "Unreconcile Entries"
2785
3940
=======
2786
3941
#: view:account.bank.statement:0
2787
3942
#: selection:account.bank.statement,state:0
2788
3943
#: view:account.invoice:0
2789
3944
#: selection:account.invoice,state:0
2790
3945
#: view:account.invoice.report:0
2791
3946
#: selection:account.invoice.report,state:0
2792
3947
#: selection:account.journal.period,state:0
2793
3948
#: view:account.subscription:0
2794
3949
#: selection:account.subscription,state:0
2795
3950
#: selection:report.invoice.created,state:0
2796
3951
msgid "Draft"
2797
3952
msgstr ""
2798
3953
2799
3954
#. module: account
2800
3955
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
2801
3956
msgid "Accounting Chart Configuration"
2802
3957
>>>>>>> MERGE-SOURCE
2803
3475
msgstr ""
3958
msgstr ""
2804
3476
3959
2805
3477
#. module: account
3960
#. module: account
2806
@@ -3503,6 +3986,7 @@
2807
3503
msgstr ""
3986
msgstr ""
2808
3504
3987
2809
3505
#. module: account
3988
#. module: account
2810
3989
<<<<<<< TREE
2811
3506
#: field:account.config.settings,date_start:0
3990
#: field:account.config.settings,date_start:0
2812
3507
msgid "Start date"
3991
msgid "Start date"
2813
3508
msgstr ""
3992
msgstr ""
2814
@@ -3516,12 +4000,18 @@
2815
3516
msgstr ""
4000
msgstr ""
2816
3517
4001
2817
3518
#. module: account
4002
#. module: account
2818
4003
=======
2819
4004
>>>>>>> MERGE-SOURCE
2820
3519
#: view:validate.account.move.lines:0
4005
#: view:validate.account.move.lines:0
2821
3520
msgid "All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore."
4006
msgid "All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore."
2822
3521
msgstr ""
4007
msgstr ""
2823
3522
4008
2824
3523
#. module: account
4009
#. module: account
2825
4010
<<<<<<< TREE
2826
3524
#: code:addons/account/account_move_line.py:98
4011
#: code:addons/account/account_move_line.py:98
2827
4012
=======
2828
4013
#: code:addons/account/invoice.py:373
2829
4014
>>>>>>> MERGE-SOURCE
2830
3525
#, python-format
4015
#, python-format
2831
3526
msgid "You have not supplied enough arguments to compute the initial balance, please select a period and a journal in the context."
4016
msgid "You have not supplied enough arguments to compute the initial balance, please select a period and a journal in the context."
2832
3527
msgstr ""
4017
msgstr ""
2833
@@ -3532,8 +4022,15 @@
2834
3532
msgstr ""
4022
msgstr ""
2835
3533
4023
2836
3534
#. module: account
4024
#. module: account
2837
4025
<<<<<<< TREE
2838
3535
#: field:account.config.settings,expects_chart_of_accounts:0
4026
#: field:account.config.settings,expects_chart_of_accounts:0
2839
3536
msgid "This company has its own chart of accounts"
4027
msgid "This company has its own chart of accounts"
2840
4028
=======
2841
4029
#: selection:account.entries.report,move_line_state:0
2842
4030
#: view:account.move.line:0
2843
4031
#: selection:account.move.line,state:0
2844
4032
msgid "Unbalanced"
2845
4033
>>>>>>> MERGE-SOURCE
2846
3537
msgstr ""
4034
msgstr ""
2847
3538
4035
2848
3539
#. module: account
4036
#. module: account
2849
@@ -3587,6 +4084,7 @@
2850
3587
msgstr ""
4084
msgstr ""
2851
3588
4085
2852
3589
#. module: account
4086
#. module: account
2853
4087
<<<<<<< TREE
2854
3590
#: view:account.config.settings:0
4088
#: view:account.config.settings:0
2855
3591
msgid "Options"
4089
msgid "Options"
2856
3592
msgstr ""
4090
msgstr ""
2857
@@ -3611,6 +4109,33 @@
2858
3611
#. module: account
4109
#. module: account
2859
3612
#: view:account.installer:0
4110
#: view:account.installer:0
2860
3613
msgid "Continue"
4111
msgid "Continue"
2861
4112
=======
2862
4113
#: code:addons/account/wizard/account_invoice_state.py:68
2863
4114
#, python-format
2864
4115
msgid "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' or 'Done' state!"
2865
4116
msgstr ""
2866
4117
2867
4118
#. module: account
2868
4119
#: code:addons/account/account.py:532
2869
4120
#, python-format
2870
4121
msgid "You cannot change the type of account from '%s' to '%s' type as it contains account entries!"
2871
4122
msgstr ""
2872
4123
2873
4124
#. module: account
2874
4125
#: report:account.general.ledger:0
2875
4126
#: report:account.general.ledger_landscape:0
2876
4127
msgid "Counterpart"
2877
4128
msgstr ""
2878
4129
2879
4130
#. module: account
2880
4131
#: view:account.journal:0
2881
4132
msgid "Invoicing Data"
2882
4133
msgstr ""
2883
4134
2884
4135
#. module: account
2885
4136
#: field:account.invoice.report,state:0
2886
4137
msgid "Invoice State"
2887
4138
>>>>>>> MERGE-SOURCE
2888
3614
msgstr ""
4139
msgstr ""
2889
3615
4140
2890
3616
#. module: account
4141
#. module: account
2891
@@ -3712,8 +4237,12 @@
2892
3712
#: field:account.entries.report,date:0
4237
#: field:account.entries.report,date:0
2893
3713
#: selection:account.general.journal,filter:0
4238
#: selection:account.general.journal,filter:0
2894
3714
#: report:account.general.ledger:0
4239
#: report:account.general.ledger:0
2895
4240
<<<<<<< TREE
2896
3715
#: report:account.general.ledger_landscape:0
4241
#: report:account.general.ledger_landscape:0
2897
3716
#: field:account.invoice.refund,date:0
4242
#: field:account.invoice.refund,date:0
2898
4243
=======
2899
4244
#: report:account.general.ledger_landscape:0
2900
4245
>>>>>>> MERGE-SOURCE
2901
3717
#: field:account.invoice.report,date:0
4246
#: field:account.invoice.report,date:0
2902
3718
#: report:account.journal.period.print:0
4247
#: report:account.journal.period.print:0
2903
3719
#: report:account.journal.period.print.sale.purchase:0
4248
#: report:account.journal.period.print.sale.purchase:0
2904
@@ -3755,19 +4284,40 @@
2905
3755
msgstr ""
4284
msgstr ""
2906
3756
4285
2907
3757
#. module: account
4286
#. module: account
2908
4287
<<<<<<< TREE
2909
3758
#: code:addons/account/account.py:2310
4288
#: code:addons/account/account.py:2310
2910
4289
=======
2911
4290
#: code:addons/account/account.py:2109
2912
4291
>>>>>>> MERGE-SOURCE
2913
3759
#, python-format
4292
#, python-format
2914
3760
msgid "Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!\n"
4293
msgid "Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!\n"
2915
3761
"Please define partner on it!"
4294
"Please define partner on it!"
2916
3762
msgstr ""
4295
msgstr ""
2917
3763
4296
2918
3764
#. module: account
4297
#. module: account
2919
4298
<<<<<<< TREE
2920
3765
#: selection:account.balance.report,display_account:0
4299
#: selection:account.balance.report,display_account:0
2921
3766
#: selection:account.common.account.report,display_account:0
4300
#: selection:account.common.account.report,display_account:0
2922
3767
#: selection:account.report.general.ledger,display_account:0
4301
#: selection:account.report.general.ledger,display_account:0
2923
3768
#: selection:account.tax,type_tax_use:0
4302
#: selection:account.tax,type_tax_use:0
2924
3769
#: selection:account.tax.template,type_tax_use:0
4303
#: selection:account.tax.template,type_tax_use:0
2925
3770
msgid "All"
4304
msgid "All"
2926
4305
=======
2927
4306
#: code:addons/account/account_move_line.py:801
2928
4307
#, python-format
2929
4308
msgid "Some entries are already reconciled !"
2930
4309
msgstr ""
2931
4310
2932
4311
#. module: account
2933
4312
#: code:addons/account/account.py:1218
2934
4313
#, python-format
2935
4314
msgid "You cannot validate a Journal Entry unless all journal items are in same chart of accounts !"
2936
4315
msgstr ""
2937
4316
2938
4317
#. module: account
2939
4318
#: view:account.tax:0
2940
4319
msgid "Account Tax"
2941
4320
>>>>>>> MERGE-SOURCE
2942
3771
msgstr ""
4321
msgstr ""
2943
3772
4322
2944
3773
#. module: account
4323
#. module: account
2945
@@ -3876,11 +4426,35 @@
2946
3876
msgstr ""
4426
msgstr ""
2947
3877
4427
2948
3878
#. module: account
4428
#. module: account
2949
4429
<<<<<<< TREE
2950
4430
=======
2951
4431
#: code:addons/account/account_move_line.py:1134
2952
4432
#, python-format
2953
4433
msgid "Unable to change tax !"
2954
4434
msgstr ""
2955
4435
2956
4436
#. module: account
2957
4437
>>>>>>> MERGE-SOURCE
2958
3879
#: field:analytic.entries.report,nbr:0
4438
#: field:analytic.entries.report,nbr:0
2959
3880
msgid "#Entries"
4439
msgid "#Entries"
2960
3881
msgstr ""
4440
msgstr ""
2961
3882
4441
2962
3883
#. module: account
4442
#. module: account
2963
4443
<<<<<<< TREE
2964
4444
=======
2965
4445
#: code:addons/account/invoice.py:1437
2966
4446
#, python-format
2967
4447
msgid "You selected an Unit of Measure which is not compatible with the product."
2968
4448
msgstr ""
2969
4449
2970
4450
#. module: account
2971
4451
#: code:addons/account/invoice.py:476
2972
4452
#, python-format
2973
4453
msgid "The Payment Term of Supplier does not have Payment Term Lines(Computation) defined !"
2974
4454
msgstr ""
2975
4455
2976
4456
#. module: account
2977
4457
>>>>>>> MERGE-SOURCE
2978
3884
#: view:account.state.open:0
4458
#: view:account.state.open:0
2979
3885
msgid "Open Invoice"
4459
msgid "Open Invoice"
2980
3886
msgstr ""
4460
msgstr ""
2981
@@ -4205,6 +4779,7 @@
2982
4205
msgstr ""
4779
msgstr ""
2983
4206
4780
2984
4207
#. module: account
4781
#. module: account
2985
4782
<<<<<<< TREE
2986
4208
#: model:ir.actions.act_window,help:account.action_bank_tree
4783
#: model:ir.actions.act_window,help:account.action_bank_tree
2987
4209
msgid "<p class=\"oe_view_nocontent_create\">\n"
4784
msgid "<p class=\"oe_view_nocontent_create\">\n"
2988
4210
"            Click to setup a new bank account. \n"
4785
"            Click to setup a new bank account. \n"
2989
@@ -4228,6 +4803,27 @@
2990
4228
#: constraint:account.period:0
4803
#: constraint:account.period:0
2991
4229
msgid "Error!\n"
4804
msgid "Error!\n"
2992
4230
"The duration of the Period(s) is/are invalid."
4805
"The duration of the Period(s) is/are invalid."
2993
4806
=======
2994
4807
#: view:account.bank.statement:0
2995
4808
msgid "Close CashBox"
2996
4809
msgstr ""
2997
4810
2998
4811
#. module: account
2999
4812
#: view:account.invoice.report:0
3000
4813
#: field:account.invoice.report,due_delay:0
3001
4814
msgid "Avg. Due Delay"
3002
4815
msgstr ""
3003
4816
3004
4817
#. module: account
3005
4818
#: view:account.entries.report:0
3006
4819
msgid "Acc.Type"
3007
4820
msgstr ""
3008
4821
3009
4822
#. module: account
3010
4823
#: code:addons/account/invoice.py:722
3011
4824
#, python-format
3012
4825
msgid "Global taxes defined, but are not in invoice lines !"
3013
4826
>>>>>>> MERGE-SOURCE
3014
4231
msgstr ""
4827
msgstr ""
3015
4232
4828
3016
4233
#. module: account
4829
#. module: account
3017
@@ -4315,7 +4911,16 @@
3018
4315
msgstr ""
4911
msgstr ""
3019
4316
4912
3020
4317
#. module: account
4913
#. module: account
3021
4914
<<<<<<< TREE
3022
4318
#: code:addons/account/account_move_line.py:867
4915
#: code:addons/account/account_move_line.py:867
3023
4916
=======
3024
4917
#: help:account.move,state:0
3025
4918
msgid "All manually created new journal entry are usually in the state 'Unposted', but you can set the option to skip that state on the related journal. In that case, they will be behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in 'Posted' state."
3026
4919
msgstr ""
3027
4920
3028
4921
#. module: account
3029
4922
#: code:addons/account/account_analytic_line.py:90
3030
4923
>>>>>>> MERGE-SOURCE
3031
4319
#, python-format
4924
#, python-format
3032
4320
msgid "You have to provide an account for the write off/exchange difference entry."
4925
msgid "You have to provide an account for the write off/exchange difference entry."
3033
4321
msgstr ""
4926
msgstr ""
3034
@@ -4464,6 +5069,7 @@
3035
4464
msgstr ""
5069
msgstr ""
3036
4465
5070
3037
4466
#. module: account
5071
#. module: account
3038
5072
<<<<<<< TREE
3039
4467
#: view:account.move.line:0
5073
#: view:account.move.line:0
3040
4468
#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
5074
#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
3041
4469
msgid "Journal Items to Reconcile"
5075
msgid "Journal Items to Reconcile"
3042
@@ -4487,6 +5093,17 @@
3043
4487
#. module: account
5093
#. module: account
3044
4488
#: view:account.tax:0
5094
#: view:account.tax:0
3045
4489
msgid "Tax Computation"
5095
msgid "Tax Computation"
3046
5096
=======
3047
5097
#: code:addons/account/account.py:2081
3048
5098
#: code:addons/account/wizard/account_use_model.py:69
3049
5099
#, python-format
3050
5100
msgid "Unable to find a valid period !"
3051
5101
msgstr ""
3052
5102
3053
5103
#. module: account
3054
5104
#: report:account.tax.code.entries:0
3055
5105
msgid "Voucher No"
3056
5106
>>>>>>> MERGE-SOURCE
3057
4490
msgstr ""
5107
msgstr ""
3058
4491
5108
3059
4492
#. module: account
5109
#. module: account
3060
@@ -4537,6 +5154,13 @@
3061
4537
msgstr ""
5154
msgstr ""
3062
4538
5155
3063
4539
#. module: account
5156
#. module: account
3064
5157
#: constraint:account.account:0
3065
5158
#: constraint:account.account.template:0
3066
5159
msgid "Configuration Error! \n"
3067
5160
"You cannot define children to an account with internal type different of \"View\"! "
3068
5161
msgstr ""
3069
5162
3070
5163
#. module: account
3071
4540
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
5164
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
3072
4541
msgid "Account Analytic Cost Ledger For Journal Report"
5165
msgid "Account Analytic Cost Ledger For Journal Report"
3073
4542
msgstr ""
5166
msgstr ""
3074
@@ -4557,6 +5181,25 @@
3075
4557
msgstr ""
5181
msgstr ""
3076
4558
5182
3077
4559
#. module: account
5183
#. module: account
3078
5184
<<<<<<< TREE
3079
5185
=======
3080
5186
#: code:addons/account/account.py:1304
3081
5187
#: code:addons/account/account.py:1332
3082
5188
#: code:addons/account/account.py:1339
3083
5189
#: code:addons/account/account_move_line.py:1061
3084
5190
#: code:addons/account/invoice.py:904
3085
5191
#: code:addons/account/wizard/account_automatic_reconcile.py:152
3086
5192
#: code:addons/account/wizard/account_fiscalyear_close.py:78
3087
5193
#: code:addons/account/wizard/account_fiscalyear_close.py:81
3088
5194
#: code:addons/account/wizard/account_move_journal.py:165
3089
5195
#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
3090
5196
#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
3091
5197
#, python-format
3092
5198
msgid "UserError"
3093
5199
msgstr ""
3094
5200
3095
5201
#. module: account
3096
5202
>>>>>>> MERGE-SOURCE
3097
4560
#: field:account.journal,type_control_ids:0
5203
#: field:account.journal,type_control_ids:0
3098
4561
msgid "Type Controls"
5204
msgid "Type Controls"
3099
4562
msgstr ""
5205
msgstr ""
3100
@@ -4579,6 +5222,7 @@
3101
4579
msgstr ""
5222
msgstr ""
3102
4580
5223
3103
4581
#. module: account
5224
#. module: account
3104
5225
<<<<<<< TREE
3105
4582
#: help:account.config.settings,group_proforma_invoices:0
5226
#: help:account.config.settings,group_proforma_invoices:0
3106
4583
msgid "Allows you to put invoices in pro-forma state."
5227
msgid "Allows you to put invoices in pro-forma state."
3107
4584
msgstr ""
5228
msgstr ""
3108
@@ -4601,6 +5245,19 @@
3109
4601
msgstr ""
5245
msgstr ""
3110
4602
5246
3111
4603
#. module: account
5247
#. module: account
3112
5248
=======
3113
5249
#: help:account.bank.statement,balance_end_cash:0
3114
5250
msgid "Closing balance based on cashBox"
3115
5251
msgstr ""
3116
5252
3117
5253
#. module: account
3118
5254
#: constraint:account.account:0
3119
5255
#: constraint:account.tax.code:0
3120
5256
msgid "Error ! You can not create recursive accounts."
3121
5257
msgstr ""
3122
5258
3123
5259
#. module: account
3124
5260
>>>>>>> MERGE-SOURCE
3125
4604
#: view:account.subscription.generate:0
5261
#: view:account.subscription.generate:0
3126
4605
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
5262
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
3127
4606
#: model:ir.ui.menu,name:account.menu_generate_subscription
5263
#: model:ir.ui.menu,name:account.menu_generate_subscription
3128
@@ -4630,6 +5287,7 @@
3129
4630
msgstr ""
5287
msgstr ""
3130
4631
5288
3131
4632
#. module: account
5289
#. module: account
3132
5290
<<<<<<< TREE
3133
4633
#: view:account.invoice:0
5291
#: view:account.invoice:0
3134
4634
msgid "My Invoices"
5292
msgid "My Invoices"
3135
4635
msgstr ""
5293
msgstr ""
3136
@@ -4642,6 +5300,22 @@
3137
4642
#. module: account
5300
#. module: account
3138
4643
#: view:wizard.multi.charts.accounts:0
5301
#: view:wizard.multi.charts.accounts:0
3139
4644
msgid "Sale Tax"
5302
msgid "Sale Tax"
3140
5303
=======
3141
5304
#: code:addons/account/invoice.py:73
3142
5305
#, python-format
3143
5306
msgid "You must define an analytic journal of type '%s' !"
3144
5307
msgstr ""
3145
5308
3146
5309
#. module: account
3147
5310
#: code:addons/account/account.py:1411
3148
5311
#, python-format
3149
5312
msgid "Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
3150
5313
msgstr ""
3151
5314
3152
5315
#. module: account
3153
5316
#: field:account.invoice.refund,date:0
3154
5317
msgid "Operation date"
3155
5318
>>>>>>> MERGE-SOURCE
3156
4645
msgstr ""
5319
msgstr ""
3157
4646
5320
3158
4647
#. module: account
5321
#. module: account
3159
@@ -4651,7 +5325,22 @@
3160
4651
msgstr ""
5325
msgstr ""
3161
4652
5326
3162
4653
#. module: account
5327
#. module: account
3163
5328
<<<<<<< TREE
3164
4654
#: view:account.invoice:0
5329
#: view:account.invoice:0
3165
5330
=======
3166
5331
#: view:validate.account.move:0
3167
5332
msgid "All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."
3168
5333
msgstr ""
3169
5334
3170
5335
#. module: account
3171
5336
#: report:account.account.balance.landscape:0
3172
5337
msgid "Account Balance -"
3173
5338
msgstr ""
3174
5339
3175
5340
#. module: account
3176
5341
#: code:addons/account/invoice.py:997
3177
5342
#, python-format
3178
5343
>>>>>>> MERGE-SOURCE
3179
4655
msgid "Invoice "
5344
msgid "Invoice "
3180
4656
msgstr ""
5345
msgstr ""
3181
4657
5346
3182
@@ -4690,6 +5379,7 @@
3183
4690
msgstr ""
5379
msgstr ""
3184
4691
5380
3185
4692
#. module: account
5381
#. module: account
3186
5382
<<<<<<< TREE
3187
4693
#: help:account.config.settings,expects_chart_of_accounts:0
5383
#: help:account.config.settings,expects_chart_of_accounts:0
3188
4694
msgid "Check this box if this company is a legal entity."
5384
msgid "Check this box if this company is a legal entity."
3189
4695
msgstr ""
5385
msgstr ""
3190
@@ -4738,6 +5428,20 @@
3191
4738
#: view:validate.account.move:0
5428
#: view:validate.account.move:0
3192
4739
#: view:validate.account.move.lines:0
5429
#: view:validate.account.move.lines:0
3193
4740
msgid "or"
5430
msgid "or"
3194
5431
=======
3195
5432
#: code:addons/account/invoice.py:812
3196
5433
#, python-format
3197
5434
msgid "Please verify the price of the invoice !\n"
3198
5435
"The real total does not match the computed total."
3199
5436
msgstr ""
3200
5437
3201
5438
#. module: account
3202
5439
#: view:account.invoice:0
3203
5440
#: field:account.invoice,user_id:0
3204
5441
#: view:account.invoice.report:0
3205
5442
#: field:account.invoice.report,user_id:0
3206
5443
msgid "Salesman"
3207
5444
>>>>>>> MERGE-SOURCE
3208
4741
msgstr ""
5445
msgstr ""
3209
4742
5446
3210
4743
#. module: account
5447
#. module: account
3211
@@ -4830,6 +5534,7 @@
3212
4830
msgstr ""
5534
msgstr ""
3213
4831
5535
3214
4832
#. module: account
5536
#. module: account
3215
5537
<<<<<<< TREE
3216
4833
#: code:addons/account/account_invoice.py:894
5538
#: code:addons/account/account_invoice.py:894
3217
4834
#, python-format
5539
#, python-format
3218
4835
msgid "Please verify the price of the invoice !\n"
5540
msgid "Please verify the price of the invoice !\n"
3219
@@ -4853,6 +5558,49 @@
3220
4853
msgstr ""
5558
msgstr ""
3221
4854
5559
3222
4855
#. module: account
5560
#. module: account
3223
5561
=======
3224
5562
#: view:account.move:0
3225
5563
#: view:account.move.line:0
3226
5564
#: code:addons/account/wizard/account_move_journal.py:153
3227
5565
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
3228
5566
#: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
3229
5567
#: model:ir.actions.act_window,name:account.act_account_partner_account_move
3230
5568
#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
3231
5569
#: model:ir.actions.act_window,name:account.action_account_moves_all_a
3232
5570
#: model:ir.actions.act_window,name:account.action_account_moves_bank
3233
5571
#: model:ir.actions.act_window,name:account.action_account_moves_purchase
3234
5572
#: model:ir.actions.act_window,name:account.action_account_moves_sale
3235
5573
#: model:ir.actions.act_window,name:account.action_move_line_search
3236
5574
#: model:ir.actions.act_window,name:account.action_move_line_select
3237
5575
#: model:ir.actions.act_window,name:account.action_move_line_tree1
3238
5576
#: model:ir.actions.act_window,name:account.action_tax_code_line_open
3239
5577
#: model:ir.model,name:account.model_account_move_line
3240
5578
#: model:ir.ui.menu,name:account.menu_action_account_moves_all
3241
5579
#: model:ir.ui.menu,name:account.menu_action_account_moves_bank
3242
5580
#: model:ir.ui.menu,name:account.menu_eaction_account_moves_purchase
3243
5581
#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
3244
5582
#, python-format
3245
5583
msgid "Journal Items"
3246
5584
msgstr ""
3247
5585
3248
5586
#. module: account
3249
5587
#: selection:account.account.type,report_type:0
3250
5588
msgid "Balance Sheet (Assets Accounts)"
3251
5589
msgstr ""
3252
5590
3253
5591
#. module: account
3254
5592
#: report:account.tax.code.entries:0
3255
5593
msgid "Third Party (Country)"
3256
5594
msgstr ""
3257
5595
3258
5596
#. module: account
3259
5597
#: model:ir.actions.act_window,help:account.action_invoice_tree4
3260
5598
msgid "With Supplier Refunds you can manage the credit notes you receive from your suppliers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form."
3261
5599
msgstr ""
3262
5600
3263
5601
#. module: account
3264
5602
#: field:account.analytic.Journal.report,date2:0
3265
5603
>>>>>>> MERGE-SOURCE
3266
4856
#: field:account.analytic.balance,date2:0
5604
#: field:account.analytic.balance,date2:0
3267
4857
#: field:account.analytic.cost.ledger,date2:0
5605
#: field:account.analytic.cost.ledger,date2:0
3268
4858
#: field:account.analytic.cost.ledger.journal.report,date2:0
5606
#: field:account.analytic.cost.ledger.journal.report,date2:0
3269
@@ -4862,6 +5610,7 @@
3270
4862
msgstr ""
5610
msgstr ""
3271
4863
5611
3272
4864
#. module: account
5612
#. module: account
3273
5613
<<<<<<< TREE
3274
4865
#: model:process.node,note:account.process_node_supplierpaymentorder0
5614
#: model:process.node,note:account.process_node_supplierpaymentorder0
3275
4866
msgid "Payment of invoices"
5615
msgid "Payment of invoices"
3276
4867
msgstr ""
5616
msgstr ""
3277
@@ -4878,6 +5627,14 @@
3278
4878
5627
3279
4879
#. module: account
5628
#. module: account
3280
4880
#: code:addons/account/account_cash_statement.py:301
5629
#: code:addons/account/account_cash_statement.py:301
3281
5630
=======
3282
5631
#: view:res.partner:0
3283
5632
msgid "Bank Details"
3284
5633
msgstr ""
3285
5634
3286
5635
#. module: account
3287
5636
#: code:addons/account/invoice.py:728
3288
5637
>>>>>>> MERGE-SOURCE
3289
4881
#, python-format
5638
#, python-format
3290
4882
msgid "There is no %s Account on the journal %s."
5639
msgid "There is no %s Account on the journal %s."
3291
4883
msgstr ""
5640
msgstr ""
3292
@@ -4934,8 +5691,20 @@
3293
4934
msgstr ""
5691
msgstr ""
3294
4935
5692
3295
4936
#. module: account
5693
#. module: account
3296
5694
<<<<<<< TREE
3297
4937
#: field:account.treasury.report,date:0
5695
#: field:account.treasury.report,date:0
3298
4938
msgid "Beginning of Period Date"
5696
msgid "Beginning of Period Date"
3299
5697
=======
3300
5698
#: field:account.journal,allow_date:0
3301
5699
msgid "Check Date not in the Period"
3302
5700
msgstr ""
3303
5701
3304
5702
#. module: account
3305
5703
#: code:addons/account/account.py:1224
3306
5704
#, python-format
3307
5705
msgid "You can not modify a posted entry of this journal !\n"
3308
5706
"You should set the journal to allow cancelling entries if you want to do that."
3309
5707
>>>>>>> MERGE-SOURCE
3310
4939
msgstr ""
5708
msgstr ""
3311
4940
5709
3312
4941
#. module: account
5710
#. module: account
3313
@@ -4954,9 +5723,20 @@
3314
4954
msgstr ""
5723
msgstr ""
3315
4955
5724
3316
4956
#. module: account
5725
#. module: account
3317
5726
<<<<<<< TREE
3318
4957
#: help:account.tax,price_include:0
5727
#: help:account.tax,price_include:0
3319
4958
#: help:account.tax.template,price_include:0
5728
#: help:account.tax.template,price_include:0
3320
4959
msgid "Check this if the price you use on the product and invoices includes this tax."
5729
msgid "Check this if the price you use on the product and invoices includes this tax."
3321
5730
=======
3322
5731
#: code:addons/account/account.py:954
3323
5732
#, python-format
3324
5733
msgid "Start period should be smaller then End period"
3325
5734
msgstr ""
3326
5735
3327
5736
#. module: account
3328
5737
#: selection:account.automatic.reconcile,power:0
3329
5738
msgid "5"
3330
5739
>>>>>>> MERGE-SOURCE
3331
4960
msgstr ""
5740
msgstr ""
3332
4961
5741
3333
4962
#. module: account
5742
#. module: account
3334
@@ -4990,7 +5770,15 @@
3335
4990
#: report:account.third_party_ledger:0
5770
#: report:account.third_party_ledger:0
3336
4991
#: report:account.third_party_ledger_other:0
5771
#: report:account.third_party_ledger_other:0
3337
4992
#: field:account.vat.declaration,target_move:0
5772
#: field:account.vat.declaration,target_move:0
3338
5773
<<<<<<< TREE
3339
4993
#: field:accounting.report,target_move:0
5774
#: field:accounting.report,target_move:0
3340
5775
=======
3341
5776
#: report:account.balancesheet.horizontal:0
3342
5777
#: report:account.balancesheet:0
3343
5778
#: report:pl.account.horizontal:0
3344
5779
#: report:pl.account:0
3345
5780
#: report:account.aged_trial_balance:0
3346
5781
>>>>>>> MERGE-SOURCE
3347
4994
msgid "Target Moves"
5782
msgid "Target Moves"
3348
4995
msgstr ""
5783
msgstr ""
3349
4996
5784
3350
@@ -5062,8 +5850,24 @@
3351
5062
msgstr ""
5850
msgstr ""
3352
5063
5851
3353
5064
#. module: account
5852
#. module: account
3354
5853
<<<<<<< TREE
3355
5065
#: help:account.invoice,sent:0
5854
#: help:account.invoice,sent:0
3356
5066
msgid "It indicates that the invoice has been sent."
5855
msgid "It indicates that the invoice has been sent."
3357
5856
=======
3358
5857
#: field:account.bank.statement,starting_details_ids:0
3359
5858
msgid "Opening Cashbox"
3360
5859
msgstr ""
3361
5860
3362
5861
#. module: account
3363
5862
#: view:account.payment.term.line:0
3364
5863
msgid "Line 1:"
3365
5864
msgstr ""
3366
5865
3367
5866
#. module: account
3368
5867
#: code:addons/account/account.py:1181
3369
5868
#, python-format
3370
5869
msgid "Integrity Error !"
3371
5870
>>>>>>> MERGE-SOURCE
3372
5067
msgstr ""
5871
msgstr ""
3373
5068
5872
3374
5069
#. module: account
5873
#. module: account
3375
@@ -5101,9 +5905,22 @@
3376
5101
msgstr ""
5905
msgstr ""
3377
5102
5906
3378
5103
#. module: account
5907
#. module: account
3379
5908
<<<<<<< TREE
3380
5104
#: model:account.financial.report,name:account.account_financial_report_balancesheet0
5909
#: model:account.financial.report,name:account.account_financial_report_balancesheet0
3381
5105
#: model:ir.actions.act_window,name:account.action_account_report_bs
5910
#: model:ir.actions.act_window,name:account.action_account_report_bs
3382
5106
#: model:ir.ui.menu,name:account.menu_account_report_bs
5911
#: model:ir.ui.menu,name:account.menu_account_report_bs
3383
5912
=======
3384
5913
#: view:account.automatic.reconcile:0
3385
5914
msgid "Reconciliation result"
3386
5915
msgstr ""
3387
5916
3388
5917
#. module: account
3389
5918
#: view:account.bs.report:0
3390
5919
#: model:ir.actions.act_window,name:account.action_account_bs_report
3391
5920
#: model:ir.ui.menu,name:account.menu_account_bs_report
3392
5921
#: report:account.balancesheet.horizontal:0
3393
5922
#: report:account.balancesheet:0
3394
5923
>>>>>>> MERGE-SOURCE
3395
5107
msgid "Balance Sheet"
5924
msgid "Balance Sheet"
3396
5108
msgstr ""
5925
msgstr ""
3397
5109
5926
3398
@@ -5212,8 +6029,15 @@
3399
5212
msgstr ""
6029
msgstr ""
3400
5213
6030
3401
5214
#. module: account
6031
#. module: account
3402
6032
<<<<<<< TREE
3403
5215
#: help:res.partner,last_reconciliation_date:0
6033
#: help:res.partner,last_reconciliation_date:0
3404
5216
msgid "Date on which the partner accounting entries were fully reconciled last time. It differs from the date of the last reconciliation made for this partner, as here we depict the fact that nothing more was to be reconciled at this date. This can be achieved in 2 ways: either the last debit/credit entry was reconciled, either the user pressed the button \"Fully Reconciled\" in the manual reconciliation process"
6034
msgid "Date on which the partner accounting entries were fully reconciled last time. It differs from the date of the last reconciliation made for this partner, as here we depict the fact that nothing more was to be reconciled at this date. This can be achieved in 2 ways: either the last debit/credit entry was reconciled, either the user pressed the button \"Fully Reconciled\" in the manual reconciliation process"
3405
6035
=======
3406
6036
#: code:addons/account/account.py:2081
3407
6037
#: code:addons/account/wizard/account_use_model.py:69
3408
6038
#, python-format
3409
6039
msgid "No period found !"
3410
6040
>>>>>>> MERGE-SOURCE
3411
5217
msgstr ""
6041
msgstr ""
3412
5218
6042
3413
5219
#. module: account
6043
#. module: account
3414
@@ -5280,12 +6104,18 @@
3415
5280
msgstr ""
6104
msgstr ""
3416
5281
6105
3417
5282
#. module: account
6106
#. module: account
3418
6107
<<<<<<< TREE
3419
5283
#: view:account.payment.term.line:0
6108
#: view:account.payment.term.line:0
3420
5284
msgid "Amount Computation"
6109
msgid "Amount Computation"
3421
5285
msgstr ""
6110
msgstr ""
3422
5286
6111
3423
5287
#. module: account
6112
#. module: account
3424
5288
#: code:addons/account/account_move_line.py:1108
6113
#: code:addons/account/account_move_line.py:1108
3425
6114
=======
3426
6115
#: code:addons/account/account.py:2940
3427
6116
#: code:addons/account/installer.py:283
3428
6117
#: code:addons/account/installer.py:295
3429
6118
>>>>>>> MERGE-SOURCE
3430
5289
#, python-format
6119
#, python-format
3431
5290
msgid "You can not add/modify entries in a closed period %s of journal %s."
6120
msgid "You can not add/modify entries in a closed period %s of journal %s."
3432
5291
msgstr ""
6121
msgstr ""
3433
@@ -5311,8 +6141,14 @@
3434
5311
msgstr ""
6141
msgstr ""
3435
5312
6142
3436
5313
#. module: account
6143
#. module: account
3437
6144
<<<<<<< TREE
3438
5314
#: model:account.account.type,name:account.account_type_asset_view1
6145
#: model:account.account.type,name:account.account_type_asset_view1
3439
5315
msgid "Asset View"
6146
msgid "Asset View"
3440
6147
=======
3441
6148
#: code:addons/account/account_move_line.py:1199
3442
6149
#, python-format
3443
6150
msgid "You can not do this modification on a reconciled entry ! Please note that you can just change some non important fields !"
3444
6151
>>>>>>> MERGE-SOURCE
3445
5316
msgstr ""
6152
msgstr ""
3446
5317
6153
3447
5318
#. module: account
6154
#. module: account
3448
@@ -5380,6 +6216,7 @@
3449
5380
msgstr ""
6216
msgstr ""
3450
5381
6217
3451
5382
#. module: account
6218
#. module: account
3452
6219
<<<<<<< TREE
3453
5383
#: view:account.invoice:0
6220
#: view:account.invoice:0
3454
5384
msgid "Draft Refund "
6221
msgid "Draft Refund "
3455
5385
msgstr ""
6222
msgstr ""
3456
@@ -5393,6 +6230,18 @@
3457
5393
#: view:account.payment.term.line:0
6230
#: view:account.payment.term.line:0
3458
5394
#: field:account.payment.term.line,value_amount:0
6231
#: field:account.payment.term.line,value_amount:0
3459
5395
msgid "Amount To Pay"
6232
msgid "Amount To Pay"
3460
6233
=======
3461
6234
#: code:addons/account/account_bank_statement.py:331
3462
6235
#: code:addons/account/invoice.py:408
3463
6236
#: code:addons/account/invoice.py:508
3464
6237
#: code:addons/account/invoice.py:523
3465
6238
#: code:addons/account/invoice.py:531
3466
6239
#: code:addons/account/invoice.py:552
3467
6240
#: code:addons/account/invoice.py:1361
3468
6241
#: code:addons/account/wizard/account_move_journal.py:63
3469
6242
#, python-format
3470
6243
msgid "Configuration Error !"
3471
6244
>>>>>>> MERGE-SOURCE
3472
5396
msgstr ""
6245
msgstr ""
3473
5397
6246
3474
5398
#. module: account
6247
#. module: account
3475
@@ -5451,12 +6300,32 @@
3476
5451
msgstr ""
6300
msgstr ""
3477
5452
6301
3478
5453
#. module: account
6302
#. module: account
3479
6303
<<<<<<< TREE
3480
5454
#: view:account.invoice.report:0
6304
#: view:account.invoice.report:0
3481
5455
msgid "Customer Invoices And Refunds"
6305
msgid "Customer Invoices And Refunds"
3482
5456
msgstr ""
6306
msgstr ""
3483
5457
6307
3484
5458
#. module: account
6308
#. module: account
3485
5459
#: field:account.analytic.line,amount_currency:0
6309
#: field:account.analytic.line,amount_currency:0
3486
6310
=======
3487
6311
#: help:account.account.type,report_type:0
3488
6312
msgid "According value related accounts will be display on respective reports (Balance Sheet Profit & Loss Account)"
3489
6313
msgstr ""
3490
6314
3491
6315
#. module: account
3492
6316
#: field:account.report.general.ledger,sortby:0
3493
6317
msgid "Sort By"
3494
6318
msgstr ""
3495
6319
3496
6320
#. module: account
3497
6321
#: code:addons/account/account.py:1340
3498
6322
#, python-format
3499
6323
msgid "There is no default default credit account defined \n"
3500
6324
"on journal \"%s\""
3501
6325
msgstr ""
3502
6326
3503
6327
#. module: account
3504
6328
>>>>>>> MERGE-SOURCE
3505
5460
#: field:account.entries.report,amount_currency:0
6329
#: field:account.entries.report,amount_currency:0
3506
5461
#: field:account.model.line,amount_currency:0
6330
#: field:account.model.line,amount_currency:0
3507
5462
#: field:account.move.line,amount_currency:0
6331
#: field:account.move.line,amount_currency:0
3508
@@ -5592,6 +6461,15 @@
3509
5592
msgstr ""
6461
msgstr ""
3510
5593
6462
3511
5594
#. module: account
6463
#. module: account
3512
6464
<<<<<<< TREE
3513
6465
=======
3514
6466
#: code:addons/account/account_move_line.py:729
3515
6467
#, python-format
3516
6468
msgid "Already Reconciled!"
3517
6469
msgstr ""
3518
6470
3519
6471
#. module: account
3520
6472
>>>>>>> MERGE-SOURCE
3521
5595
#: help:account.tax,type:0
6473
#: help:account.tax,type:0
3522
5596
msgid "The computation method for the tax amount."
6474
msgid "The computation method for the tax amount."
3523
5597
msgstr ""
6475
msgstr ""
3524
@@ -5627,7 +6505,11 @@
3525
5627
6505
3526
5628
#. module: account
6506
#. module: account
3527
5629
#: view:account.move.line.reconcile:0
6507
#: view:account.move.line.reconcile:0
3528
6508
<<<<<<< TREE
3529
5630
#: code:addons/account/account_move_line.py:882
6509
#: code:addons/account/account_move_line.py:882
3530
6510
=======
3531
6511
#: code:addons/account/account_move_line.py:821
3532
6512
>>>>>>> MERGE-SOURCE
3533
5631
#, python-format
6513
#, python-format
3534
5632
msgid "Write-Off"
6514
msgid "Write-Off"
3535
5633
msgstr ""
6515
msgstr ""
3536
@@ -5756,8 +6638,14 @@
3537
5756
msgstr ""
6638
msgstr ""
3538
5757
6639
3539
5758
#. module: account
6640
#. module: account
3540
6641
<<<<<<< TREE
3541
5759
#: view:account.invoice:0
6642
#: view:account.invoice:0
3542
5760
msgid "(update)"
6643
msgid "(update)"
3543
6644
=======
3544
6645
#: code:addons/account/wizard/account_change_currency.py:59
3545
6646
#, python-format
3546
6647
msgid "New currency is not confirured properly !"
3547
6648
>>>>>>> MERGE-SOURCE
3548
5761
msgstr ""
6649
msgstr ""
3549
5762
6650
3550
5763
#. module: account
6651
#. module: account
3551
@@ -5780,6 +6668,7 @@
3552
5780
msgstr ""
6668
msgstr ""
3553
5781
6669
3554
5782
#. module: account
6670
#. module: account
3555
6671
<<<<<<< TREE
3556
5783
#: code:addons/account/account.py:2286
6672
#: code:addons/account/account.py:2286
3557
5784
#, python-format
6673
#, python-format
3558
5785
msgid "You have a wrong expression \"%(...)s\" in your model !"
6674
msgid "You have a wrong expression \"%(...)s\" in your model !"
3559
@@ -5798,6 +6687,18 @@
3560
5798
#. module: account
6687
#. module: account
3561
5799
#: field:account.journal,loss_account_id:0
6688
#: field:account.journal,loss_account_id:0
3562
5800
msgid "Loss Account"
6689
msgid "Loss Account"
3563
6690
=======
3564
6691
#: code:addons/account/account_move_line.py:1137
3565
6692
#: code:addons/account/account_move_line.py:1220
3566
6693
#, python-format
3567
6694
msgid "You can not use an inactive account!"
3568
6695
msgstr ""
3569
6696
3570
6697
#. module: account
3571
6698
#: code:addons/account/account_move_line.py:794
3572
6699
#, python-format
3573
6700
msgid "Entries are not of the same account or already reconciled ! "
3574
6701
>>>>>>> MERGE-SOURCE
3575
5801
msgstr ""
6702
msgstr ""
3576
5802
6703
3577
5803
#. module: account
6704
#. module: account
3578
@@ -5823,6 +6724,7 @@
3579
5823
msgstr ""
6724
msgstr ""
3580
5824
6725
3581
5825
#. module: account
6726
#. module: account
3582
6727
<<<<<<< TREE
3583
5826
#: code:addons/account/account.py:1321
6728
#: code:addons/account/account.py:1321
3584
5827
#, python-format
6729
#, python-format
3585
5828
msgid "You cannot validate this journal entry because account \"%s\" does not belong to chart of accounts \"%s\"."
6730
msgid "You cannot validate this journal entry because account \"%s\" does not belong to chart of accounts \"%s\"."
3586
@@ -5831,6 +6733,23 @@
3587
5831
#. module: account
6733
#. module: account
3588
5832
#: view:account.financial.report:0
6734
#: view:account.financial.report:0
3589
5833
msgid "Report"
6735
msgid "Report"
3590
6736
=======
3591
6737
#: selection:account.automatic.reconcile,power:0
3592
6738
msgid "7"
3593
6739
msgstr ""
3594
6740
3595
6741
#. module: account
3596
6742
#: code:addons/account/account_bank_statement.py:391
3597
6743
#: code:addons/account/invoice.py:373
3598
6744
#, python-format
3599
6745
msgid "Invalid action !"
3600
6746
msgstr ""
3601
6747
3602
6748
#. module: account
3603
6749
#: code:addons/account/wizard/account_move_journal.py:102
3604
6750
#, python-format
3605
6751
msgid "Period: %s"
3606
6752
>>>>>>> MERGE-SOURCE
3607
5834
msgstr ""
6753
msgstr ""
3608
5835
6754
3609
5836
#. module: account
6755
#. module: account
3610
@@ -5941,6 +6860,15 @@
3611
5941
msgstr ""
6860
msgstr ""
3612
5942
6861
3613
5943
#. module: account
6862
#. module: account
3614
6863
<<<<<<< TREE
3615
6864
=======
3616
6865
#: code:addons/account/invoice.py:997
3617
6866
#, python-format
3618
6867
msgid "is validated."
3619
6868
msgstr ""
3620
6869
3621
6870
#. module: account
3622
6871
>>>>>>> MERGE-SOURCE
3623
5944
#: view:account.chart.template:0
6872
#: view:account.chart.template:0
3624
5945
#: field:account.chart.template,account_root_id:0
6873
#: field:account.chart.template,account_root_id:0
3625
5946
msgid "Root Account"
6874
msgid "Root Account"
3626
@@ -6028,6 +6956,7 @@
3627
6028
msgstr ""
6956
msgstr ""
3628
6029
6957
3629
6030
#. module: account
6958
#. module: account
3630
6959
<<<<<<< TREE
3631
6031
#: view:account.invoice.report:0
6960
#: view:account.invoice.report:0
3632
6032
msgid "Open and Paid Invoices"
6961
msgid "Open and Paid Invoices"
3633
6033
msgstr ""
6962
msgstr ""
3634
@@ -6040,6 +6969,11 @@
3635
6040
#. module: account
6969
#. module: account
3636
6041
#: view:account.config.settings:0
6970
#: view:account.config.settings:0
3637
6042
msgid "Bank & Cash"
6971
msgid "Bank & Cash"
3638
6972
=======
3639
6973
#: code:addons/account/account.py:546
3640
6974
#, python-format
3641
6975
msgid "You cannot modify Company of account as its related record exist in Entry Lines"
3642
6976
>>>>>>> MERGE-SOURCE
3643
6043
msgstr ""
6977
msgstr ""
3644
6044
6978
3645
6045
#. module: account
6979
#. module: account
3646
@@ -6327,9 +7261,23 @@
3647
6327
msgstr ""
7261
msgstr ""
3648
6328
7262
3649
6329
#. module: account
7263
#. module: account
3650
7264
<<<<<<< TREE
3651
6330
#: code:addons/account/account.py:686
7265
#: code:addons/account/account.py:686
3652
6331
#, python-format
7266
#, python-format
3653
6332
msgid "You cannot change the owner company of an account that already contains journal items."
7267
msgid "You cannot change the owner company of an account that already contains journal items."
3654
7268
=======
3655
7269
#: code:addons/account/invoice.py:409
3656
7270
#: code:addons/account/invoice.py:509
3657
7271
#: code:addons/account/invoice.py:1362
3658
7272
#, python-format
3659
7273
msgid "Can not find account chart for this company, Please Create account."
3660
7274
msgstr ""
3661
7275
3662
7276
#. module: account
3663
7277
#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
3664
7278
#, python-format
3665
7279
msgid "Enter a Start date !"
3666
7280
>>>>>>> MERGE-SOURCE
3667
6333
msgstr ""
7281
msgstr ""
3668
6334
7282
3669
6335
#. module: account
7283
#. module: account
3670
@@ -6471,13 +7419,19 @@
3671
6471
msgstr ""
7419
msgstr ""
3672
6472
7420
3673
6473
#. module: account
7421
#. module: account
3674
7422
<<<<<<< TREE
3675
6474
#: code:addons/account/account_analytic_line.py:142
7423
#: code:addons/account/account_analytic_line.py:142
3676
6475
#: code:addons/account/account_move_line.py:958
7424
#: code:addons/account/account_move_line.py:958
3677
7425
=======
3678
7426
#: code:addons/account/account_analytic_line.py:141
3679
7427
#: code:addons/account/account_move_line.py:897
3680
7428
>>>>>>> MERGE-SOURCE
3681
6476
#, python-format
7429
#, python-format
3682
6477
msgid "Entries: "
7430
msgid "Entries: "
3683
6478
msgstr ""
7431
msgstr ""
3684
6479
7432
3685
6480
#. module: account
7433
#. module: account
3686
7434
<<<<<<< TREE
3687
6481
#: help:res.partner.bank,currency_id:0
7435
#: help:res.partner.bank,currency_id:0
3688
6482
msgid "Currency of the related account journal."
7436
msgid "Currency of the related account journal."
3689
6483
msgstr ""
7437
msgstr ""
3690
@@ -6495,6 +7449,14 @@
3691
6495
#. module: account
7449
#. module: account
3692
6496
#: selection:account.account.type,report_type:0
7450
#: selection:account.account.type,report_type:0
3693
6497
#: code:addons/account/account.py:190
7451
#: code:addons/account/account.py:190
3694
7452
=======
3695
7453
#: view:account.use.model:0
3696
7454
msgid "Create manual recurring entries in a chosen journal."
3697
7455
msgstr ""
3698
7456
3699
7457
#. module: account
3700
7458
#: code:addons/account/account.py:1407
3701
7459
>>>>>>> MERGE-SOURCE
3702
6498
#, python-format
7460
#, python-format
3703
6499
msgid "Balance Sheet (Asset account)"
7461
msgid "Balance Sheet (Asset account)"
3704
6500
msgstr ""
7462
msgstr ""
3705
@@ -6510,8 +7472,14 @@
3706
6510
msgstr ""
7472
msgstr ""
3707
6511
7473
3708
6512
#. module: account
7474
#. module: account
3709
7475
<<<<<<< TREE
3710
6513
#: view:account.move.line:0
7476
#: view:account.move.line:0
3711
6514
msgid "Next Partner Entries to reconcile"
7477
msgid "Next Partner Entries to reconcile"
3712
7478
=======
3713
7479
#: code:addons/account/account_move_line.py:772
3714
7480
#, python-format
3715
7481
msgid "Entry \"%s\" is not valid !"
3716
7482
>>>>>>> MERGE-SOURCE
3717
6515
msgstr ""
7483
msgstr ""
3718
6516
7484
3719
6517
#. module: account
7485
#. module: account
3720
@@ -6556,6 +7524,7 @@
3721
6556
msgstr ""
7524
msgstr ""
3722
6557
7525
3723
6558
#. module: account
7526
#. module: account
3724
7527
<<<<<<< TREE
3725
6559
#: selection:account.account.type,report_type:0
7528
#: selection:account.account.type,report_type:0
3726
6560
#: code:addons/account/account.py:189
7529
#: code:addons/account/account.py:189
3727
6561
#, python-format
7530
#, python-format
3728
@@ -6576,6 +7545,39 @@
3729
6576
#. module: account
7545
#. module: account
3730
6577
#: code:addons/account/account.py:1024
7546
#: code:addons/account/account.py:1024
3731
6578
#: code:addons/account/account_move_line.py:1108
7547
#: code:addons/account/account_move_line.py:1108
3732
7548
=======
3733
7549
#: view:account.payment.term.line:0
3734
7550
msgid "  valuation: percent"
3735
7551
msgstr ""
3736
7552
3737
7553
#. module: account
3738
7554
#: code:addons/account/account.py:509
3739
7555
#: code:addons/account/account.py:511
3740
7556
#: code:addons/account/account.py:836
3741
7557
#: code:addons/account/account.py:915
3742
7558
#: code:addons/account/account.py:990
3743
7559
#: code:addons/account/account.py:1218
3744
7560
#: code:addons/account/account.py:1224
3745
7561
#: code:addons/account/account.py:2109
3746
7562
#: code:addons/account/account.py:2357
3747
7563
#: code:addons/account/account_analytic_line.py:89
3748
7564
#: code:addons/account/account_analytic_line.py:98
3749
7565
#: code:addons/account/account_bank_statement.py:292
3750
7566
#: code:addons/account/account_bank_statement.py:305
3751
7567
#: code:addons/account/account_bank_statement.py:345
3752
7568
#: code:addons/account/account_cash_statement.py:329
3753
7569
#: code:addons/account/account_cash_statement.py:349
3754
7570
#: code:addons/account/account_move_line.py:1182
3755
7571
#: code:addons/account/account_move_line.py:1197
3756
7572
#: code:addons/account/account_move_line.py:1199
3757
7573
#: code:addons/account/invoice.py:793
3758
7574
#: code:addons/account/invoice.py:823
3759
7575
#: code:addons/account/invoice.py:1014
3760
7576
#: code:addons/account/wizard/account_invoice_refund.py:100
3761
7577
#: code:addons/account/wizard/account_invoice_refund.py:102
3762
7578
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
3763
7579
#: code:addons/account/wizard/account_use_model.py:44
3764
7580
>>>>>>> MERGE-SOURCE
3765
6579
#, python-format
7581
#, python-format
3766
6580
msgid "Error !"
7582
msgid "Error !"
3767
6581
msgstr ""
7583
msgstr ""
3768
@@ -6661,11 +7663,22 @@
3769
6661
msgstr ""
7663
msgstr ""
3770
6662
7664
3771
6663
#. module: account
7665
#. module: account
3772
7666
<<<<<<< TREE
3773
6664
#: report:account.general.ledger:0
7667
#: report:account.general.ledger:0
3774
6665
#: report:account.general.ledger_landscape:0
7668
#: report:account.general.ledger_landscape:0
3775
6666
#: report:account.third_party_ledger:0
7669
#: report:account.third_party_ledger:0
3776
6667
#: report:account.third_party_ledger_other:0
7670
#: report:account.third_party_ledger_other:0
3777
6668
msgid "JRNL"
7671
msgid "JRNL"
3778
7672
=======
3779
7673
#: report:account.general.ledger_landscape:0
3780
7674
msgid "JRNL"
3781
7675
msgstr ""
3782
7676
3783
7677
#. module: account
3784
7678
#: view:account.partner.balance:0
3785
7679
#: view:account.partner.ledger:0
3786
7680
msgid "This report is an analysis done by a partner. It is a PDF report containing one line per partner representing the cumulative credit balance"
3787
7681
>>>>>>> MERGE-SOURCE
3788
6669
msgstr ""
7682
msgstr ""
3789
6670
7683
3790
6671
#. module: account
7684
#. module: account
3791
@@ -6706,9 +7719,13 @@
3792
6706
msgstr ""
7719
msgstr ""
3793
6707
7720
3794
6708
#. module: account
7721
#. module: account
3795
7722
<<<<<<< TREE
3796
6709
#: view:account.bank.statement:0
7723
#: view:account.bank.statement:0
3797
6710
#: code:addons/account/account.py:422
7724
#: code:addons/account/account.py:422
3798
6711
#: code:addons/account/account.py:434
7725
#: code:addons/account/account.py:434
3799
7726
=======
3800
7727
#: code:addons/account/wizard/account_change_currency.py:64
3801
7728
>>>>>>> MERGE-SOURCE
3802
6712
#, python-format
7729
#, python-format
3803
6713
msgid "Opening Balance"
7730
msgid "Opening Balance"
3804
6714
msgstr ""
7731
msgstr ""
3805
@@ -6725,7 +7742,12 @@
3806
6725
7742
3807
6726
#. module: account
7743
#. module: account
3808
6727
#: report:account.general.ledger:0
7744
#: report:account.general.ledger:0
3810
6728
#: report:account.general.ledger_landscape:0
7745
<<<<<<< TREE
3811
7746
#: report:account.general.ledger_landscape:0
3812
7747
=======
3813
7748
#: report:account.general.ledger_landscape:0
3814
7749
#: view:account.report.general.ledger:0
3815
7750
>>>>>>> MERGE-SOURCE
3816
6729
#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
7751
#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
3817
6730
#: model:ir.actions.report.xml,name:account.account_general_ledger
7752
#: model:ir.actions.report.xml,name:account.account_general_ledger
3818
6731
#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
7753
#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
3819
@@ -6774,10 +7796,13 @@
3820
6774
#: report:account.journal.period.print:0
7796
#: report:account.journal.period.print:0
3821
6775
#: report:account.journal.period.print.sale.purchase:0
7797
#: report:account.journal.period.print.sale.purchase:0
3822
6776
#: report:account.partner.balance:0
7798
#: report:account.partner.balance:0
3823
7799
#: report:pl.account.horizontal:0
3824
7800
#: report:pl.account:0
3825
6777
msgid "Total:"
7801
msgid "Total:"
3826
6778
msgstr ""
7802
msgstr ""
3827
6779
7803
3828
6780
#. module: account
7804
#. module: account
3829
7805
<<<<<<< TREE
3830
6781
#: constraint:account.journal:0
7806
#: constraint:account.journal:0
3831
6782
msgid "Configuration error!\n"
7807
msgid "Configuration error!\n"
3832
6783
"The currency chosen should be shared by the default accounts too."
7808
"The currency chosen should be shared by the default accounts too."
3833
@@ -6785,6 +7810,9 @@
3834
6785
7810
3835
6786
#. module: account
7811
#. module: account
3836
6787
#: code:addons/account/account.py:2256
7812
#: code:addons/account/account.py:2256
3837
7813
=======
3838
7814
#: code:addons/account/account.py:2064
3839
7815
>>>>>>> MERGE-SOURCE
3840
6788
#, python-format
7816
#, python-format
3841
6789
msgid "You can specify year, month and date in the name of the model using the following labels:\n"
7817
msgid "You can specify year, month and date in the name of the model using the following labels:\n"
3842
6790
"\n"
7818
"\n"
3843
@@ -6817,6 +7845,7 @@
3844
6817
msgstr ""
7845
msgstr ""
3845
6818
7846
3846
6819
#. module: account
7847
#. module: account
3847
7848
<<<<<<< TREE
3848
6820
#: constraint:account.fiscalyear:0
7849
#: constraint:account.fiscalyear:0
3849
6821
msgid "Error!\n"
7850
msgid "Error!\n"
3850
6822
"The start date of a fiscal year must precede its end date."
7851
"The start date of a fiscal year must precede its end date."
3851
@@ -6825,6 +7854,12 @@
3852
6825
#. module: account
7854
#. module: account
3853
6826
#: view:account.tax.template:0
7855
#: view:account.tax.template:0
3854
6827
msgid "Taxes used in Sales"
7856
msgid "Taxes used in Sales"
3855
7857
=======
3856
7858
#: code:addons/account/invoice.py:476
3857
7859
#: code:addons/account/wizard/account_invoice_refund.py:137
3858
7860
#, python-format
3859
7861
msgid "Data Insufficient !"
3860
7862
>>>>>>> MERGE-SOURCE
3861
6828
msgstr ""
7863
msgstr ""
3862
6829
7864
3863
6830
#. module: account
7865
#. module: account
3864
@@ -6936,6 +7971,15 @@
3865
6936
msgstr ""
7971
msgstr ""
3866
6937
7972
3867
6938
#. module: account
7973
#. module: account
3868
7974
<<<<<<< TREE
3869
7975
=======
3870
7976
#: code:addons/account/invoice.py:524
3871
7977
#, python-format
3872
7978
msgid "Can not find account chart for this company in invoice line account, Please Create account."
3873
7979
msgstr ""
3874
7980
3875
7981
#. module: account
3876
7982
>>>>>>> MERGE-SOURCE
3877
6939
#: view:account.tax.template:0
7983
#: view:account.tax.template:0
3878
6940
msgid "Account Tax Template"
7984
msgid "Account Tax Template"
3879
6941
msgstr ""
7985
msgstr ""
3880
@@ -7089,9 +8133,15 @@
3881
7089
msgstr ""
8133
msgstr ""
3882
7090
8134
3883
7091
#. module: account
8135
#. module: account
3884
8136
<<<<<<< TREE
3885
7092
#: field:account.invoice,reference:0
8137
#: field:account.invoice,reference:0
3886
7093
#: field:account.invoice.line,invoice_id:0
8138
#: field:account.invoice.line,invoice_id:0
3887
7094
msgid "Invoice Reference"
8139
msgid "Invoice Reference"
3888
8140
=======
3889
8141
#: code:addons/account/account.py:952
3890
8142
#, python-format
3891
8143
msgid "You should have chosen periods that belongs to the same company"
3892
8144
>>>>>>> MERGE-SOURCE
3893
7095
msgstr ""
8145
msgstr ""
3894
7096
8146
3895
7097
#. module: account
8147
#. module: account
3896
@@ -7201,6 +8251,7 @@
3897
7201
msgstr ""
8251
msgstr ""
3898
7202
8252
3899
7203
#. module: account
8253
#. module: account
3900
8254
<<<<<<< TREE
3901
7204
#: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
8255
#: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
3902
7205
msgid "<p>\n"
8256
msgid "<p>\n"
3903
7206
"                Click to add a new analytic account.\n"
8257
"                Click to add a new analytic account.\n"
3904
@@ -7225,6 +8276,9 @@
3905
7225
8276
3906
7226
#. module: account
8277
#. module: account
3907
7227
#: code:addons/account/account.py:3158
8278
#: code:addons/account/account.py:3158
3908
8279
=======
3909
8280
#: code:addons/account/account_cash_statement.py:250
3910
8281
>>>>>>> MERGE-SOURCE
3911
7228
#, python-format
8282
#, python-format
3912
7229
msgid "OPEJ"
8283
msgid "OPEJ"
3913
7230
msgstr ""
8284
msgstr ""
3914
@@ -7236,10 +8290,20 @@
3915
7236
msgstr ""
8290
msgstr ""
3916
7237
8291
3917
7238
#. module: account
8292
#. module: account
3918
8293
<<<<<<< TREE
3919
7239
#: selection:account.entries.report,move_line_state:0
8294
#: selection:account.entries.report,move_line_state:0
3920
7240
#: view:account.move.line:0
8295
#: view:account.move.line:0
3921
7241
#: selection:account.move.line,state:0
8296
#: selection:account.move.line,state:0
3922
7242
msgid "Unbalanced"
8297
msgid "Unbalanced"
3923
8298
=======
3924
8299
#: help:account.installer.modules,account_followup:0
3925
8300
msgid "Helps you generate reminder letters for unpaid invoices, including multiple levels of reminding and customized per-partner policies."
3926
8301
msgstr ""
3927
8302
3928
8303
#. module: account
3929
8304
#: view:account.payment.term.line:0
3930
8305
msgid "  value amount: n.a"
3931
8306
>>>>>>> MERGE-SOURCE
3932
7243
msgstr ""
8307
msgstr ""
3933
7244
8308
3934
7245
#. module: account
8309
#. module: account
3935
@@ -7279,6 +8343,7 @@
3936
7279
msgstr ""
8343
msgstr ""
3937
7280
8344
3938
7281
#. module: account
8345
#. module: account
3939
8346
<<<<<<< TREE
3940
7282
#: model:ir.ui.menu,name:account.menu_multi_currency
8347
#: model:ir.ui.menu,name:account.menu_multi_currency
3941
7283
msgid "Multi-Currencies"
8348
msgid "Multi-Currencies"
3942
7284
msgstr ""
8349
msgstr ""
3943
@@ -7290,6 +8355,16 @@
3944
7290
8355
3945
7291
#. module: account
8356
#. module: account
3946
7292
#: code:addons/account/account.py:3145
8357
#: code:addons/account/account.py:3145
3947
8358
=======
3948
8359
#: code:addons/account/account_move_line.py:1277
3949
8360
#, python-format
3950
8361
msgid "Bad account !"
3951
8362
msgstr ""
3952
8363
3953
8364
#. module: account
3954
8365
#: code:addons/account/account.py:2821
3955
8366
#: code:addons/account/installer.py:432
3956
8367
>>>>>>> MERGE-SOURCE
3957
7293
#, python-format
8368
#, python-format
3958
7294
msgid "Sales Journal"
8369
msgid "Sales Journal"
3959
7295
msgstr ""
8370
msgstr ""
3960
@@ -7300,7 +8375,11 @@
3961
7300
msgstr ""
8375
msgstr ""
3962
7301
8376
3963
7302
#. module: account
8377
#. module: account
3964
8378
<<<<<<< TREE
3965
7303
#: code:addons/account/account_move_line.py:1186
8379
#: code:addons/account/account_move_line.py:1186
3966
8380
=======
3967
8381
#: code:addons/account/account_move_line.py:1252
3968
8382
>>>>>>> MERGE-SOURCE
3969
7304
#, python-format
8383
#, python-format
3970
7305
msgid "No piece number !"
8384
msgid "No piece number !"
3971
7306
msgstr ""
8385
msgstr ""
3972
@@ -7592,9 +8671,23 @@
3973
7592
msgstr ""
8671
msgstr ""
3974
7593
8672
3975
7594
#. module: account
8673
#. module: account
3976
8674
<<<<<<< TREE
3977
7595
#: code:addons/account/account.py:653
8675
#: code:addons/account/account.py:653
3978
7596
#: code:addons/account/account.py:656
8676
#: code:addons/account/account.py:656
3979
7597
#: code:addons/account/account.py:668
8677
#: code:addons/account/account.py:668
3980
8678
=======
3981
8679
#: code:addons/account/account.py:516
3982
8680
#: code:addons/account/account.py:529
3983
8681
#: code:addons/account/account.py:532
3984
8682
#: code:addons/account/account.py:546
3985
8683
#: code:addons/account/account.py:654
3986
8684
#: code:addons/account/account.py:941
3987
8685
#: code:addons/account/account_move_line.py:723
3988
8686
#: code:addons/account/account_move_line.py:767
3989
8687
#: code:addons/account/invoice.py:722
3990
8688
#: code:addons/account/invoice.py:725
3991
8689
#: code:addons/account/invoice.py:728
3992
8690
>>>>>>> MERGE-SOURCE
3993
7598
#, python-format
8691
#, python-format
3994
7599
msgid "Warning !"
8692
msgid "Warning !"
3995
7600
msgstr ""
8693
msgstr ""
3996
@@ -7627,11 +8720,14 @@
3997
7627
msgstr ""
8720
msgstr ""
3998
7628
8721
3999
7629
#. module: account
8722
#. module: account
4000
8723
<<<<<<< TREE
4001
7630
#: view:account.move.line.unreconcile.select:0
8724
#: view:account.move.line.unreconcile.select:0
4002
7631
msgid "Open for Unreconciliation"
8725
msgid "Open for Unreconciliation"
4003
7632
msgstr ""
8726
msgstr ""
4004
7633
8727
4005
7634
#. module: account
8728
#. module: account
4006
8729
=======
4007
8730
>>>>>>> MERGE-SOURCE
4008
7635
#: field:account.bank.statement.line,partner_id:0
8731
#: field:account.bank.statement.line,partner_id:0
4009
7636
#: view:account.entries.report:0
8732
#: view:account.entries.report:0
4010
7637
#: field:account.entries.report,partner_id:0
8733
#: field:account.entries.report,partner_id:0
4011
@@ -7662,7 +8758,17 @@
4012
7662
msgstr ""
8758
msgstr ""
4013
7663
8759
4014
7664
#. module: account
8760
#. module: account
4015
8761
<<<<<<< TREE
4016
7665
#: code:addons/account/account_invoice.py:873
8762
#: code:addons/account/account_invoice.py:873
4017
8763
=======
4018
8764
#: code:addons/account/wizard/account_invoice_refund.py:100
4019
8765
#, python-format
4020
8766
msgid "Can not %s draft/proforma/cancel invoice."
4021
8767
msgstr ""
4022
8768
4023
8769
#. module: account
4024
8770
#: code:addons/account/invoice.py:795
4025
8771
>>>>>>> MERGE-SOURCE
4026
7666
#, python-format
8772
#, python-format
4027
7667
msgid "No Invoice Lines !"
8773
msgid "No Invoice Lines !"
4028
7668
msgstr ""
8774
msgstr ""
4029
@@ -7701,6 +8807,15 @@
4030
7701
msgstr ""
8807
msgstr ""
4031
7702
8808
4032
7703
#. module: account
8809
#. module: account
4033
8810
<<<<<<< TREE
4034
8811
=======
4035
8812
#: code:addons/account/invoice.py:360
4036
8813
#, python-format
4037
8814
msgid "Invoice '%s' is paid."
4038
8815
msgstr ""
4039
8816
4040
8817
#. module: account
4041
8818
>>>>>>> MERGE-SOURCE
4042
7704
#: model:process.node,note:account.process_node_electronicfile0
8819
#: model:process.node,note:account.process_node_electronicfile0
4043
7705
msgid "Automatic entry"
8820
msgid "Automatic entry"
4044
7706
msgstr ""
8821
msgstr ""
4045
@@ -7732,7 +8847,11 @@
4046
7732
msgstr ""
8847
msgstr ""
4047
7733
8848
4048
7734
#. module: account
8849
#. module: account
4049
8850
<<<<<<< TREE
4050
7735
#: code:addons/account/account_invoice.py:1428
8851
#: code:addons/account/account_invoice.py:1428
4051
8852
=======
4052
8853
#: code:addons/account/invoice.py:1298
4053
8854
>>>>>>> MERGE-SOURCE
4054
7736
#, python-format
8855
#, python-format
4055
7737
msgid "You must first select a partner !"
8856
msgid "You must first select a partner !"
4056
7738
msgstr ""
8857
msgstr ""
4057
@@ -7810,7 +8929,12 @@
4058
7810
msgstr ""
8929
msgstr ""
4059
7811
8930
4060
7812
#. module: account
8931
#. module: account
4061
8932
<<<<<<< TREE
4062
7813
#: code:addons/account/account.py:3148
8933
#: code:addons/account/account.py:3148
4063
8934
=======
4064
8935
#: code:addons/account/account.py:2885
4065
8936
#: code:addons/account/installer.py:495
4066
8937
>>>>>>> MERGE-SOURCE
4067
7814
#, python-format
8938
#, python-format
4068
7815
msgid "Purchase Refund Journal"
8939
msgid "Purchase Refund Journal"
4069
7816
msgstr ""
8940
msgstr ""
4070
@@ -7945,6 +9069,7 @@
4071
7945
msgstr ""
9069
msgstr ""
4072
7946
9070
4073
7947
#. module: account
9071
#. module: account
4074
9072
<<<<<<< TREE
4075
7948
#: field:account.aged.trial.balance,chart_account_id:0
9073
#: field:account.aged.trial.balance,chart_account_id:0
4076
7949
#: field:account.balance.report,chart_account_id:0
9074
#: field:account.balance.report,chart_account_id:0
4077
7950
#: field:account.central.journal,chart_account_id:0
9075
#: field:account.central.journal,chart_account_id:0
4078
@@ -7960,6 +9085,17 @@
4079
7960
#: field:account.report.general.ledger,chart_account_id:0
9085
#: field:account.report.general.ledger,chart_account_id:0
4080
7961
#: field:account.vat.declaration,chart_account_id:0
9086
#: field:account.vat.declaration,chart_account_id:0
4081
7962
#: field:accounting.report,chart_account_id:0
9087
#: field:accounting.report,chart_account_id:0
4082
9088
=======
4083
9089
#: report:account.general.ledger:0
4084
9090
#: report:account.partner.balance:0
4085
9091
#: report:account.third_party_ledger:0
4086
9092
#: report:account.third_party_ledger_other:0
4087
9093
#: report:account.balancesheet.horizontal:0
4088
9094
#: report:account.balancesheet:0
4089
9095
#: report:pl.account.horizontal:0
4090
9096
#: report:pl.account:0
4091
9097
#: report:account.aged_trial_balance:0
4092
9098
>>>>>>> MERGE-SOURCE
4093
7963
msgid "Chart of Account"
9099
msgid "Chart of Account"
4094
7964
msgstr ""
9100
msgstr ""
4095
7965
9101
4096
@@ -8043,12 +9179,16 @@
4097
8043
msgstr ""
9179
msgstr ""
4098
8044
9180
4099
8045
#. module: account
9181
#. module: account
4100
9182
<<<<<<< TREE
4101
8046
#: model:email.template,subject:account.email_template_edi_invoice
9183
#: model:email.template,subject:account.email_template_edi_invoice
4102
8047
msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
9184
msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
4103
8048
msgstr ""
9185
msgstr ""
4104
8049
9186
4105
8050
#. module: account
9187
#. module: account
4106
8051
#: code:addons/account/account_move_line.py:1211
9188
#: code:addons/account/account_move_line.py:1211
4107
9189
=======
4108
9190
#: code:addons/account/invoice.py:905
4109
9191
>>>>>>> MERGE-SOURCE
4110
8052
#, python-format
9192
#, python-format
4111
8053
msgid "You cannot use this general account in this journal, check the tab 'Entry Controls' on the related journal."
9193
msgid "You cannot use this general account in this journal, check the tab 'Entry Controls' on the related journal."
4112
8054
msgstr ""
9194
msgstr ""
4113
@@ -8111,9 +9251,17 @@
4114
8111
#: report:account.account.balance:0
9251
#: report:account.account.balance:0
4115
8112
#: report:account.central.journal:0
9252
#: report:account.central.journal:0
4116
8113
#: report:account.general.journal:0
9253
#: report:account.general.journal:0
4117
9254
<<<<<<< TREE
4118
8114
#: report:account.general.ledger:0
9255
#: report:account.general.ledger:0
4119
8115
#: report:account.general.ledger_landscape:0
9256
#: report:account.general.ledger_landscape:0
4120
9257
=======
4121
9258
#: report:account.general.ledger_landscape:0
4122
9259
>>>>>>> MERGE-SOURCE
4123
8116
#: report:account.partner.balance:0
9260
#: report:account.partner.balance:0
4124
9261
#: report:account.balancesheet.horizontal:0
4125
9262
#: report:account.balancesheet:0
4126
9263
#: report:pl.account.horizontal:0
4127
9264
#: report:pl.account:0
4128
8117
msgid "Filter By"
9265
msgid "Filter By"
4129
8118
msgstr ""
9266
msgstr ""
4130
8119
9267
4131
@@ -8154,7 +9302,12 @@
4132
8154
msgstr ""
9302
msgstr ""
4133
8155
9303
4134
8156
#. module: account
9304
#. module: account
4135
9305
<<<<<<< TREE
4136
8157
#: code:addons/account/account.py:3146
9306
#: code:addons/account/account.py:3146
4137
9307
=======
4138
9308
#: code:addons/account/account.py:2838
4139
9309
#: code:addons/account/installer.py:452
4140
9310
>>>>>>> MERGE-SOURCE
4141
8158
#, python-format
9311
#, python-format
4142
8159
msgid "Purchase Journal"
9312
msgid "Purchase Journal"
4143
8160
msgstr ""
9313
msgstr ""
4144
@@ -8341,9 +9494,21 @@
4145
8341
msgstr ""
9494
msgstr ""
4146
8342
9495
4147
8343
#. module: account
9496
#. module: account
4148
9497
<<<<<<< TREE
4149
8344
#: model:account.account.type,name:account.data_account_type_expense
9498
#: model:account.account.type,name:account.data_account_type_expense
4150
8345
#: model:account.financial.report,name:account.account_financial_report_expense0
9499
#: model:account.financial.report,name:account.account_financial_report_expense0
4151
8346
msgid "Expense"
9500
msgid "Expense"
4152
9501
=======
4153
9502
#: constraint:account.bank.statement.line:0
4154
9503
msgid "The amount of the voucher must be the same amount as the one on the statement line"
4155
9504
msgstr ""
4156
9505
4157
9506
#. module: account
4158
9507
#: code:addons/account/account_move_line.py:1137
4159
9508
#: code:addons/account/account_move_line.py:1220
4160
9509
#, python-format
4161
9510
msgid "Bad account!"
4162
9511
>>>>>>> MERGE-SOURCE
4163
8347
msgstr ""
9512
msgstr ""
4164
8348
9513
4165
8349
#. module: account
9514
#. module: account
4166
@@ -8352,6 +9517,15 @@
4167
8352
msgstr ""
9517
msgstr ""
4168
8353
9518
4169
8354
#. module: account
9519
#. module: account
4170
9520
<<<<<<< TREE
4171
9521
=======
4172
9522
#: code:addons/account/account_move_line.py:1062
4173
9523
#, python-format
4174
9524
msgid "The account move (%s) for centralisation has been confirmed!"
4175
9525
msgstr ""
4176
9526
4177
9527
#. module: account
4178
9528
>>>>>>> MERGE-SOURCE
4179
8355
#: help:account.move.line,amount_currency:0
9529
#: help:account.move.line,amount_currency:0
4180
8356
msgid "The amount expressed in an optional other currency if it is a multi-currency entry."
9530
msgid "The amount expressed in an optional other currency if it is a multi-currency entry."
4181
8357
msgstr ""
9531
msgstr ""
4182
@@ -8549,17 +9723,31 @@
4183
8549
msgstr ""
9723
msgstr ""
4184
8550
9724
4185
8551
#. module: account
9725
#. module: account
4186
9726
<<<<<<< TREE
4187
8552
#: field:account.cashbox.line,pieces:0
9727
#: field:account.cashbox.line,pieces:0
4188
8553
msgid "Unit of Currency"
9728
msgid "Unit of Currency"
4189
8554
msgstr ""
9729
msgstr ""
4190
8555
9730
4191
8556
#. module: account
9731
#. module: account
4192
8557
#: code:addons/account/account.py:3147
9732
#: code:addons/account/account.py:3147
4193
9733
=======
4194
9734
#: code:addons/account/account.py:2861
4195
9735
#: code:addons/account/installer.py:476
4196
9736
>>>>>>> MERGE-SOURCE
4197
8558
#, python-format
9737
#, python-format
4198
8559
msgid "Sales Refund Journal"
9738
msgid "Sales Refund Journal"
4199
8560
msgstr ""
9739
msgstr ""
4200
8561
9740
4201
8562
#. module: account
9741
#. module: account
4202
9742
<<<<<<< TREE
4203
9743
=======
4204
9744
#: code:addons/account/account.py:941
4205
9745
#, python-format
4206
9746
msgid "You cannot modify company of this period as its related record exist in Entry Lines"
4207
9747
msgstr ""
4208
9748
4209
9749
#. module: account
4210
9750
>>>>>>> MERGE-SOURCE
4211
8563
#: view:account.move:0
9751
#: view:account.move:0
4212
8564
#: view:account.move.line:0
9752
#: view:account.move.line:0
4213
8565
msgid "Information"
9753
msgid "Information"
4214
@@ -8618,12 +9806,17 @@
4215
8618
msgstr ""
9806
msgstr ""
4216
8619
9807
4217
8620
#. module: account
9808
#. module: account
4218
9809
<<<<<<< TREE
4219
8621
#: code:addons/account/account_invoice.py:873
9810
#: code:addons/account/account_invoice.py:873
4220
9811
=======
4221
9812
#: code:addons/account/invoice.py:795
4222
9813
>>>>>>> MERGE-SOURCE
4223
8622
#, python-format
9814
#, python-format
4224
8623
msgid "Please create some invoice lines."
9815
msgid "Please create some invoice lines."
4225
8624
msgstr ""
9816
msgstr ""
4226
8625
9817
4227
8626
#. module: account
9818
#. module: account
4228
9819
<<<<<<< TREE
4229
8627
#: code:addons/account/wizard/pos_box.py:37
9820
#: code:addons/account/wizard/pos_box.py:37
4230
8628
#, python-format
9821
#, python-format
4231
8629
msgid "Please check that the field 'Internal Transfers Account' is set on the payment method '%s'."
9822
msgid "Please check that the field 'Internal Transfers Account' is set on the payment method '%s'."
4232
@@ -8636,6 +9829,20 @@
4233
8636
9829
4234
8637
#. module: account
9830
#. module: account
4235
8638
#: code:addons/account/account.py:3155
9831
#: code:addons/account/account.py:3155
4236
9832
=======
4237
9833
#: report:account.overdue:0
4238
9834
msgid "Dear Sir/Madam,"
4239
9835
msgstr ""
4240
9836
4241
9837
#. module: account
4242
9838
#: view:account.installer.modules:0
4243
9839
msgid "Configure Your Accounting Application"
4244
9840
msgstr ""
4245
9841
4246
9842
#. module: account
4247
9843
#: code:addons/account/account.py:2864
4248
9844
#: code:addons/account/installer.py:479
4249
9845
>>>>>>> MERGE-SOURCE
4250
8639
#, python-format
9846
#, python-format
4251
8640
msgid "SCNJ"
9847
msgid "SCNJ"
4252
8641
msgstr ""
9848
msgstr ""
4253
@@ -8693,7 +9900,12 @@
4254
8693
#: report:account.general.journal:0
9900
#: report:account.general.journal:0
4255
8694
#: field:account.general.journal,period_from:0
9901
#: field:account.general.journal,period_from:0
4256
8695
#: report:account.general.ledger:0
9902
#: report:account.general.ledger:0
4258
8696
#: report:account.general.ledger_landscape:0
9903
<<<<<<< TREE
4259
9904
#: report:account.general.ledger_landscape:0
4260
9905
=======
4261
9906
#: report:account.general.ledger_landscape:0
4262
9907
#: report:account.journal.period.print:0
4263
9908
>>>>>>> MERGE-SOURCE
4264
8697
#: report:account.partner.balance:0
9909
#: report:account.partner.balance:0
4265
8698
#: field:account.partner.balance,period_from:0
9910
#: field:account.partner.balance,period_from:0
4266
8699
#: field:account.partner.ledger,period_from:0
9911
#: field:account.partner.ledger,period_from:0
4267
@@ -8709,12 +9921,19 @@
4268
8709
msgstr ""
9921
msgstr ""
4269
8710
9922
4270
8711
#. module: account
9923
#. module: account
4271
9924
<<<<<<< TREE
4272
8712
#: model:ir.actions.report.xml,name:account.account_central_journal
9925
#: model:ir.actions.report.xml,name:account.account_central_journal
4273
8713
msgid "Central Journal"
9926
msgid "Central Journal"
4274
9927
=======
4275
9928
#: code:addons/account/account.py:2357
4276
9929
#, python-format
4277
9930
msgid "Cannot locate parent code for template account!"
4278
9931
>>>>>>> MERGE-SOURCE
4279
8714
msgstr ""
9932
msgstr ""
4280
8715
9933
4281
8716
#. module: account
9934
#. module: account
4282
8717
#: field:account.aged.trial.balance,direction_selection:0
9935
#: field:account.aged.trial.balance,direction_selection:0
4283
9936
#: report:account.aged_trial_balance:0
4284
8718
msgid "Analysis Direction"
9937
msgid "Analysis Direction"
4285
8719
msgstr ""
9938
msgstr ""
4286
8720
9939
4287
@@ -8739,8 +9958,24 @@
4288
8739
msgstr ""
9958
msgstr ""
4289
8740
9959
4290
8741
#. module: account
9960
#. module: account
4291
9961
<<<<<<< TREE
4292
8742
#: field:account.subscription,period_total:0
9962
#: field:account.subscription,period_total:0
4293
8743
msgid "Number of Periods"
9963
msgid "Number of Periods"
4294
9964
=======
4295
9965
#: code:addons/account/invoice.py:1014
4296
9966
#, python-format
4297
9967
msgid "You cannot cancel the Invoice which is Partially Paid! You need to unreconcile concerned payment entries!"
4298
9968
msgstr ""
4299
9969
4300
9970
#. module: account
4301
9971
#: report:account.overdue:0
4302
9972
msgid "Best regards."
4303
9973
msgstr ""
4304
9974
4305
9975
#. module: account
4306
9976
#: view:account.invoice:0
4307
9977
msgid "Unpaid"
4308
9978
>>>>>>> MERGE-SOURCE
4309
8744
msgstr ""
9979
msgstr ""
4310
8745
9980
4311
8746
#. module: account
9981
#. module: account
4312
@@ -8749,11 +9984,51 @@
4313
8749
msgstr ""
9984
msgstr ""
4314
8750
9985
4315
8751
#. module: account
9986
#. module: account
4316
9987
<<<<<<< TREE
4317
9988
=======
4318
9989
#: constraint:account.move.line:0
4319
9990
msgid "You can not create move line on view account."
4320
9991
msgstr ""
4321
9992
4322
9993
#. module: account
4323
9994
#: code:addons/account/wizard/account_change_currency.py:70
4324
9995
#, python-format
4325
9996
msgid "Current currency is not confirured properly !"
4326
9997
msgstr ""
4327
9998
4328
9999
#. module: account
4329
10000
#: code:addons/account/account.py:952
4330
10001
#: code:addons/account/account.py:954
4331
10002
#: code:addons/account/account.py:1195
4332
10003
#: code:addons/account/account.py:1407
4333
10004
#: code:addons/account/account.py:1411
4334
10005
#: code:addons/account/account_cash_statement.py:250
4335
10006
#: code:addons/account/account_move_line.py:771
4336
10007
#: code:addons/account/account_move_line.py:794
4337
10008
#: code:addons/account/account_move_line.py:796
4338
10009
#: code:addons/account/account_move_line.py:799
4339
10010
#: code:addons/account/account_move_line.py:801
4340
10011
#: code:addons/account/account_move_line.py:1123
4341
10012
#: code:addons/account/report/common_report_header.py:92
4342
10013
#: code:addons/account/wizard/account_change_currency.py:38
4343
10014
#: code:addons/account/wizard/account_change_currency.py:59
4344
10015
#: code:addons/account/wizard/account_change_currency.py:64
4345
10016
#: code:addons/account/wizard/account_change_currency.py:70
4346
10017
#: code:addons/account/wizard/account_move_bank_reconcile.py:49
4347
10018
#: code:addons/account/wizard/account_report_common.py:120
4348
10019
#: code:addons/account/wizard/account_report_common.py:126
4349
10020
#, python-format
4350
10021
msgid "Error"
4351
10022
msgstr ""
4352
10023
4353
10024
#. module: account
4354
10025
>>>>>>> MERGE-SOURCE
4355
8752
#: view:account.account.template:0
10026
#: view:account.account.template:0
4356
8753
msgid "Receivale Accounts"
10027
msgid "Receivale Accounts"
4357
8754
msgstr ""
10028
msgstr ""
4358
8755
10029
4359
8756
#. module: account
10030
#. module: account
4360
10031
<<<<<<< TREE
4361
8757
#: field:account.config.settings,purchase_refund_sequence_prefix:0
10032
#: field:account.config.settings,purchase_refund_sequence_prefix:0
4362
8758
msgid "Supplier credit note sequence"
10033
msgid "Supplier credit note sequence"
4363
8759
msgstr ""
10034
msgstr ""
4364
@@ -8788,6 +10063,16 @@
4365
8788
#: code:addons/account/account_move_line.py:827
10063
#: code:addons/account/account_move_line.py:827
4366
8789
#, python-format
10064
#, python-format
4367
8790
msgid "To reconcile the entries company should be the same for all entries."
10065
msgid "To reconcile the entries company should be the same for all entries."
4368
10066
=======
4369
10067
#: selection:account.account.type,report_type:0
4370
10068
msgid "Profit & Loss (Income Accounts)"
4371
10069
msgstr ""
4372
10070
4373
10071
#. module: account
4374
10072
#: view:account.tax:0
4375
10073
#: view:account.tax.template:0
4376
10074
msgid "Keep empty to use the income account"
4377
10075
>>>>>>> MERGE-SOURCE
4378
8791
msgstr ""
10076
msgstr ""
4379
8792
10077
4380
8793
#. module: account
10078
#. module: account
4381
@@ -8801,8 +10086,12 @@
4382
8801
#: field:account.entries.report,balance:0
10086
#: field:account.entries.report,balance:0
4383
8802
#: report:account.general.journal:0
10087
#: report:account.general.journal:0
4384
8803
#: report:account.general.ledger:0
10088
#: report:account.general.ledger:0
4385
10089
<<<<<<< TREE
4386
8804
#: report:account.general.ledger_landscape:0
10090
#: report:account.general.ledger_landscape:0
4387
8805
#: field:account.invoice,residual:0
10091
#: field:account.invoice,residual:0
4388
10092
=======
4389
10093
#: report:account.general.ledger_landscape:0
4390
10094
>>>>>>> MERGE-SOURCE
4391
8806
#: field:account.move.line,balance:0
10095
#: field:account.move.line,balance:0
4392
8807
#: report:account.partner.balance:0
10096
#: report:account.partner.balance:0
4393
8808
#: selection:account.payment.term.line,value:0
10097
#: selection:account.payment.term.line,value:0
4394
@@ -8813,6 +10102,10 @@
4395
8813
#: field:account.treasury.report,balance:0
10102
#: field:account.treasury.report,balance:0
4396
8814
#: field:report.account.receivable,balance:0
10103
#: field:report.account.receivable,balance:0
4397
8815
#: field:report.aged.receivable,balance:0
10104
#: field:report.aged.receivable,balance:0
4398
10105
#: report:account.balancesheet.horizontal:0
4399
10106
#: report:account.balancesheet:0
4400
10107
#: report:pl.account.horizontal:0
4401
10108
#: report:pl.account:0
4402
8816
msgid "Balance"
10109
msgid "Balance"
4403
8817
msgstr ""
10110
msgstr ""
4404
8818
10111
4405
@@ -8823,7 +10116,15 @@
4406
8823
10116
4407
8824
#. module: account
10117
#. module: account
4408
8825
#: report:account.account.balance:0
10118
#: report:account.account.balance:0
4410
8826
#: report:account.general.ledger_landscape:0
10119
<<<<<<< TREE
4411
10120
#: report:account.general.ledger_landscape:0
4412
10121
=======
4413
10122
#: report:account.general.ledger_landscape:0
4414
10123
#: report:account.balancesheet.horizontal:0
4415
10124
#: report:account.balancesheet:0
4416
10125
#: report:pl.account.horizontal:0
4417
10126
#: report:pl.account:0
4418
10127
>>>>>>> MERGE-SOURCE
4419
8827
msgid "Display Account"
10128
msgid "Display Account"
4420
8828
msgstr ""
10129
msgstr ""
4421
8829
10130
4422
@@ -8852,11 +10153,21 @@
4423
8852
msgstr ""
10153
msgstr ""
4424
8853
10154
4425
8854
#. module: account
10155
#. module: account
4426
10156
<<<<<<< TREE
4427
8855
#: view:account.fiscalyear.close:0
10157
#: view:account.fiscalyear.close:0
4428
8856
msgid "Generate Fiscal Year Opening Entries"
10158
msgid "Generate Fiscal Year Opening Entries"
4429
8857
msgstr ""
10159
msgstr ""
4430
8858
10160
4431
8859
#. module: account
10161
#. module: account
4432
10162
=======
4433
10163
#: model:ir.actions.act_window,help:account.action_account_period_form
4434
10164
msgid "Here you can define a financial period, an interval of time in your company's financial year. An accounting period typically is a month or a quarter. It usually corresponds to the periods of the tax declaration. Create and manage periods from here and decide whether a period should be closed or left open depending on your company's activities over a specific period."
4435
10165
msgstr ""
4436
10166
4437
10167
#. module: account
4438
10168
#: report:account.general.ledger:0
4439
10169
#: report:account.journal.period.print:0
4440
10170
>>>>>>> MERGE-SOURCE
4441
8860
#: report:account.third_party_ledger:0
10171
#: report:account.third_party_ledger:0
4442
8861
#: report:account.third_party_ledger_other:0
10172
#: report:account.third_party_ledger_other:0
4443
8862
msgid "Filters By"
10173
msgid "Filters By"
4444
@@ -8886,9 +10197,13 @@
4445
8886
msgstr ""
10197
msgstr ""
4446
8887
10198
4447
8888
#. module: account
10199
#. module: account
4448
10200
<<<<<<< TREE
4449
8889
#: code:addons/account/account_bank_statement.py:477
10201
#: code:addons/account/account_bank_statement.py:477
4450
8890
#: code:addons/account/account_invoice.py:458
10202
#: code:addons/account/account_invoice.py:458
4451
8891
#: code:addons/account/wizard/account_period_close.py:51
10203
#: code:addons/account/wizard/account_period_close.py:51
4452
10204
=======
4453
10205
#: code:addons/account/account_move_line.py:1134
4454
10206
>>>>>>> MERGE-SOURCE
4455
8892
#, python-format
10207
#, python-format
4456
8893
msgid "Invalid Action!"
10208
msgid "Invalid Action!"
4457
8894
msgstr ""
10209
msgstr ""
4458
@@ -9032,7 +10347,12 @@
4459
9032
#: report:account.general.journal:0
10347
#: report:account.general.journal:0
4460
9033
#: field:account.general.journal,period_to:0
10348
#: field:account.general.journal,period_to:0
4461
9034
#: report:account.general.ledger:0
10349
#: report:account.general.ledger:0
4463
9035
#: report:account.general.ledger_landscape:0
10350
<<<<<<< TREE
4464
10351
#: report:account.general.ledger_landscape:0
4465
10352
=======
4466
10353
#: report:account.general.ledger_landscape:0
4467
10354
#: report:account.journal.period.print:0
4468
10355
>>>>>>> MERGE-SOURCE
4469
9036
#: report:account.partner.balance:0
10356
#: report:account.partner.balance:0
4470
9037
#: field:account.partner.balance,period_to:0
10357
#: field:account.partner.balance,period_to:0
4471
9038
#: field:account.partner.ledger,period_to:0
10358
#: field:account.partner.ledger,period_to:0
4472
@@ -9081,8 +10401,15 @@
4473
9081
msgstr ""
10401
msgstr ""
4474
9082
10402
4475
9083
#. module: account
10403
#. module: account
4476
10404
<<<<<<< TREE
4477
9084
#: report:account.overdue:0
10405
#: report:account.overdue:0
4478
9085
msgid "Maturity date"
10406
msgid "Maturity date"
4479
10407
=======
4480
10408
#: code:addons/account/invoice.py:725
4481
10409
#, python-format
4482
10410
msgid "Tax base different !\n"
4483
10411
"Click on compute to update tax base"
4484
10412
>>>>>>> MERGE-SOURCE
4485
9086
msgstr ""
10413
msgstr ""
4486
9087
10414
4487
9088
#. module: account
10415
#. module: account
4488
@@ -9115,8 +10442,12 @@
4489
9115
#: report:account.third_party_ledger:0
10442
#: report:account.third_party_ledger:0
4490
9116
#: report:account.third_party_ledger_other:0
10443
#: report:account.third_party_ledger_other:0
4491
9117
#: field:account.vat.declaration,date_from:0
10444
#: field:account.vat.declaration,date_from:0
4492
10445
<<<<<<< TREE
4493
9118
#: field:accounting.report,date_from:0
10446
#: field:accounting.report,date_from:0
4494
9119
#: field:accounting.report,date_from_cmp:0
10447
#: field:accounting.report,date_from_cmp:0
4495
10448
=======
4496
10449
#: report:account.aged_trial_balance:0
4497
10450
>>>>>>> MERGE-SOURCE
4498
9120
msgid "Start Date"
10451
msgid "Start Date"
4499
9121
msgstr ""
10452
msgstr ""
4500
9122
10453
4501
@@ -9146,7 +10477,11 @@
4502
9146
msgstr ""
10477
msgstr ""
4503
9147
10478
4504
9148
#. module: account
10479
#. module: account
4505
10480
<<<<<<< TREE
4506
9149
#: code:addons/account/account_invoice.py:894
10481
#: code:addons/account/account_invoice.py:894
4507
10482
=======
4508
10483
#: code:addons/account/invoice.py:812
4509
10484
>>>>>>> MERGE-SOURCE
4510
9150
#, python-format
10485
#, python-format
4511
9151
msgid "Bad total !"
10486
msgid "Bad total !"
4512
9152
msgstr ""
10487
msgstr ""
4513
@@ -9200,6 +10535,7 @@
4514
9200
msgstr ""
10535
msgstr ""
4515
9201
10536
4516
9202
#. module: account
10537
#. module: account
4517
10538
<<<<<<< TREE
4518
9203
#: view:account.bank.statement:0
10539
#: view:account.bank.statement:0
4519
9204
#: view:account.move:0
10540
#: view:account.move:0
4520
9205
#: view:account.move.line:0
10541
#: view:account.move.line:0
4521
@@ -9237,6 +10573,28 @@
4522
9237
#. module: account
10573
#. module: account
4523
9238
#: field:account.bank.statement.line,name:0
10574
#: field:account.bank.statement.line,name:0
4524
9239
msgid "OBI"
10575
msgid "OBI"
4525
10576
=======
4526
10577
#: field:account.account,active:0
4527
10578
#: field:account.analytic.journal,active:0
4528
10579
#: field:account.journal.period,active:0
4529
10580
#: field:account.payment.term,active:0
4530
10581
#: field:account.tax,active:0
4531
10582
msgid "Active"
4532
10583
msgstr ""
4533
10584
4534
10585
#. module: account
4535
10586
#: code:addons/account/invoice.py:353
4536
10587
#, python-format
4537
10588
msgid "Unknown Error"
4538
10589
msgstr ""
4539
10590
4540
10591
#. module: account
4541
10592
#: code:addons/account/account.py:1181
4542
10593
#, python-format
4543
10594
msgid "You cannot validate a non-balanced entry !\n"
4544
10595
"Make sure you have configured Payment Term properly !\n"
4545
10596
"It should contain atleast one Payment Term Line with type \"Balance\" !"
4546
10597
>>>>>>> MERGE-SOURCE
4547
9240
msgstr ""
10598
msgstr ""
4548
9241
10599
4549
9242
#. module: account
10600
#. module: account
4550
@@ -9286,11 +10644,20 @@
4551
9286
msgstr ""
10644
msgstr ""
4552
9287
10645
4553
9288
#. module: account
10646
#. module: account
4554
10647
<<<<<<< TREE
4555
9289
#: view:account.invoice:0
10648
#: view:account.invoice:0
4556
9290
msgid "Draft Invoice "
10649
msgid "Draft Invoice "
4557
9291
msgstr ""
10650
msgstr ""
4558
9292
10651
4559
9293
#. module: account
10652
#. module: account
4560
10653
=======
4561
10654
#: help:account.invoice.refund,journal_id:0
4562
10655
msgid "You can select here the journal to use for the refund invoice that will be created. If you leave that field empty, it will use the same journal as the current invoice."
4563
10656
msgstr ""
4564
10657
4565
10658
#. module: account
4566
10659
#: view:account.general.journal:0
4567
10660
>>>>>>> MERGE-SOURCE
4568
9294
#: model:ir.ui.menu,name:account.menu_account_general_journal
10661
#: model:ir.ui.menu,name:account.menu_account_general_journal
4569
9295
msgid "General Journals"
10662
msgid "General Journals"
4570
9296
msgstr ""
10663
msgstr ""
4571
@@ -9460,11 +10827,14 @@
4572
9460
msgstr ""
10827
msgstr ""
4573
9461
10828
4574
9462
#. module: account
10829
#. module: account
4575
10830
<<<<<<< TREE
4576
9463
#: field:account.subscription.generate,date:0
10831
#: field:account.subscription.generate,date:0
4577
9464
msgid "Generate Entries Before"
10832
msgid "Generate Entries Before"
4578
9465
msgstr ""
10833
msgstr ""
4579
9466
10834
4580
9467
#. module: account
10835
#. module: account
4581
10836
=======
4582
10837
>>>>>>> MERGE-SOURCE
4583
9468
#: model:ir.actions.act_window,name:account.action_subscription_form_running
10838
#: model:ir.actions.act_window,name:account.action_subscription_form_running
4584
9469
msgid "Running Subscriptions"
10839
msgid "Running Subscriptions"
4585
9470
msgstr ""
10840
msgstr ""
4586
@@ -9540,6 +10910,7 @@
4587
9540
msgstr ""
10910
msgstr ""
4588
9541
10911
4589
9542
#. module: account
10912
#. module: account
4590
10913
<<<<<<< TREE
4591
9543
#: selection:account.financial.report,display_detail:0
10914
#: selection:account.financial.report,display_detail:0
4592
9544
msgid "No detail"
10915
msgid "No detail"
4593
9545
msgstr ""
10916
msgstr ""
4594
@@ -9552,6 +10923,32 @@
4595
9552
msgstr ""
10923
msgstr ""
4596
9553
10924
4597
9554
#. module: account
10925
#. module: account
4598
10926
=======
4599
10927
#: help:account.model,name:0
4600
10928
msgid "This is a model for recurring accounting entries"
4601
10929
msgstr ""
4602
10930
4603
10931
#. module: account
4604
10932
#: code:addons/account/account_analytic_line.py:99
4605
10933
#, python-format
4606
10934
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
4607
10935
msgstr ""
4608
10936
4609
10937
#. module: account
4610
10938
#: report:account.general.ledger:0
4611
10939
#: report:account.third_party_ledger:0
4612
10940
#: report:account.third_party_ledger_other:0
4613
10941
msgid "JNRL"
4614
10942
msgstr ""
4615
10943
4616
10944
#. module: account
4617
10945
#: view:account.payment.term.line:0
4618
10946
msgid "  value amount: 0.02"
4619
10947
msgstr ""
4620
10948
4621
10949
#. module: account
4622
10950
#: view:account.fiscalyear:0
4623
10951
>>>>>>> MERGE-SOURCE
4624
9555
#: view:account.move:0
10952
#: view:account.move:0
4625
9556
#: view:account.move.line:0
10953
#: view:account.move.line:0
4626
9557
msgid "States"
10954
msgid "States"
4627
@@ -9577,6 +10974,7 @@
4628
9577
#: field:report.account.sales,amount_total:0
10974
#: field:report.account.sales,amount_total:0
4629
9578
#: field:report.account_type.sales,amount_total:0
10975
#: field:report.account_type.sales,amount_total:0
4630
9579
#: field:report.invoice.created,amount_total:0
10976
#: field:report.invoice.created,amount_total:0
4631
10977
#: report:account.aged_trial_balance:0
4632
9580
msgid "Total"
10978
msgid "Total"
4633
9581
msgstr ""
10979
msgstr ""
4634
9582
10980
4635
@@ -9728,6 +11126,7 @@
4636
9728
msgstr ""
11126
msgstr ""
4637
9729
11127
4638
9730
#. module: account
11128
#. module: account
4639
11129
<<<<<<< TREE
4640
9731
#: sql_constraint:account.journal:0
11130
#: sql_constraint:account.journal:0
4641
9732
msgid "The code of the journal must be unique per company !"
11131
msgid "The code of the journal must be unique per company !"
4642
9733
msgstr ""
11132
msgstr ""
4643
@@ -9746,6 +11145,35 @@
4644
9746
#: view:account.automatic.reconcile:0
11145
#: view:account.automatic.reconcile:0
4645
9747
#: view:account.move.line.reconcile.writeoff:0
11146
#: view:account.move.line.reconcile.writeoff:0
4646
9748
msgid "Write-Off Move"
11147
msgid "Write-Off Move"
4647
11148
=======
4648
11149
#: code:addons/account/account_move_line.py:729
4649
11150
#: code:addons/account/account_move_line.py:806
4650
11151
#: code:addons/account/wizard/account_invoice_state.py:44
4651
11152
#: code:addons/account/wizard/account_invoice_state.py:68
4652
11153
#: code:addons/account/wizard/account_report_balance_sheet.py:70
4653
11154
#: code:addons/account/wizard/account_state_open.py:37
4654
11155
#: code:addons/account/wizard/account_validate_account_move.py:39
4655
11156
#: code:addons/account/wizard/account_validate_account_move.py:61
4656
11157
#, python-format
4657
11158
msgid "Warning"
4658
11159
msgstr ""
4659
11160
4660
11161
#. module: account
4661
11162
#: help:product.category,property_account_expense_categ:0
4662
11163
#: help:product.template,property_account_expense:0
4663
11164
msgid "This account will be used to value outgoing stock for the current product category using cost price"
4664
11165
msgstr ""
4665
11166
4666
11167
#. module: account
4667
11168
#: selection:account.account,type:0
4668
11169
#: selection:account.account.template,type:0
4669
11170
#: selection:account.bank.statement,state:0
4670
11171
#: selection:account.entries.report,type:0
4671
11172
#: view:account.fiscalyear:0
4672
11173
#: selection:account.fiscalyear,state:0
4673
11174
#: selection:account.period,state:0
4674
11175
msgid "Closed"
4675
11176
>>>>>>> MERGE-SOURCE
4676
9749
msgstr ""
11177
msgstr ""
4677
9750
11178
4678
9751
#. module: account
11179
#. module: account
4679
@@ -9814,6 +11242,7 @@
4680
9814
msgstr ""
11242
msgstr ""
4681
9815
11243
4682
9816
#. module: account
11244
#. module: account
4683
11245
<<<<<<< TREE
4684
9817
#: help:account.model.line,quantity:0
11246
#: help:account.model.line,quantity:0
4685
9818
msgid "The optional quantity on entries."
11247
msgid "The optional quantity on entries."
4686
9819
msgstr ""
11248
msgstr ""
4687
@@ -9821,6 +11250,21 @@
4688
9821
#. module: account
11250
#. module: account
4689
9822
#: field:account.automatic.reconcile,reconciled:0
11251
#: field:account.automatic.reconcile,reconciled:0
4690
9823
msgid "Reconciled transactions"
11252
msgid "Reconciled transactions"
4691
11253
=======
4692
11254
#: constraint:account.account.template:0
4693
11255
msgid "Error ! You can not create recursive account templates."
4694
11256
msgstr ""
4695
11257
4696
11258
#. module: account
4697
11259
#: view:account.subscription:0
4698
11260
msgid "Recurring"
4699
11261
msgstr ""
4700
11262
4701
11263
#. module: account
4702
11264
#: code:addons/account/account_move_line.py:796
4703
11265
#, python-format
4704
11266
msgid "Entry is already reconciled"
4705
11267
>>>>>>> MERGE-SOURCE
4706
9824
msgstr ""
11268
msgstr ""
4707
9825
11269
4708
9826
#. module: account
11270
#. module: account
4709
@@ -9845,6 +11289,7 @@
4710
9845
msgstr ""
11289
msgstr ""
4711
9846
11290
4712
9847
#. module: account
11291
#. module: account
4713
11292
<<<<<<< TREE
4714
9848
#: view:account.analytic.line:0
11293
#: view:account.analytic.line:0
4715
9849
msgid "Analytic Journal Items related to a purchase journal."
11294
msgid "Analytic Journal Items related to a purchase journal."
4716
9850
msgstr ""
11295
msgstr ""
4717
@@ -9852,6 +11297,13 @@
4718
9852
#. module: account
11297
#. module: account
4719
9853
#: help:account.account,type:0
11298
#: help:account.account,type:0
4720
9854
msgid "The 'Internal Type' is used for features available on different types of accounts: view can not have journal items, consolidation are accounts that can have children accounts for multi-company consolidations, payable/receivable are for partners accounts (for debit/credit computations), closed for depreciated accounts."
11299
msgid "The 'Internal Type' is used for features available on different types of accounts: view can not have journal items, consolidation are accounts that can have children accounts for multi-company consolidations, payable/receivable are for partners accounts (for debit/credit computations), closed for depreciated accounts."
4721
11300
=======
4722
11301
#: code:addons/account/account_move_line.py:1252
4723
11302
#, python-format
4724
11303
msgid "Can not create an automatic sequence for this piece !\n"
4725
11304
"\n"
4726
11305
"Put a sequence in the journal definition for automatic numbering or create a sequence manually for this piece."
4727
11306
>>>>>>> MERGE-SOURCE
4728
9855
msgstr ""
11307
msgstr ""
4729
9856
11308
4730
9857
#. module: account
11309
#. module: account
4731
@@ -9961,6 +11413,7 @@
4732
9961
msgstr ""
11413
msgstr ""
4733
9962
11414
4734
9963
#. module: account
11415
#. module: account
4735
11416
<<<<<<< TREE
4736
9964
#: model:ir.actions.act_window,help:account.action_tax_code_list
11417
#: model:ir.actions.act_window,help:account.action_tax_code_list
4737
9965
msgid "<p class=\"oe_view_nocontent_create\">\n"
11418
msgid "<p class=\"oe_view_nocontent_create\">\n"
4738
9966
"                Click to define a new tax code.\n"
11419
"                Click to define a new tax code.\n"
4739
@@ -9971,6 +11424,11 @@
4740
9971
"                one or several tax code.\n"
11424
"                one or several tax code.\n"
4741
9972
"              </p>\n"
11425
"              </p>\n"
4742
9973
"            "
11426
"            "
4743
11427
=======
4744
11428
#: code:addons/account/invoice.py:345
4745
11429
#, python-format
4746
11430
msgid "Invoice '%s' is waiting for validation."
4747
11431
>>>>>>> MERGE-SOURCE
4748
9974
msgstr ""
11432
msgstr ""
4749
9975
11433
4750
9976
#. module: account
11434
#. module: account
4751
@@ -10002,8 +11460,19 @@
4752
10002
msgstr ""
11460
msgstr ""
4753
10003
11461
4754
10004
#. module: account
11462
#. module: account
4755
11463
<<<<<<< TREE
4756
10005
#: view:account.config.settings:0
11464
#: view:account.config.settings:0
4757
10006
msgid "Install more chart templates"
11465
msgid "Install more chart templates"
4758
11466
=======
4759
11467
#: code:addons/account/account_move_line.py:1123
4760
11468
#, python-format
4761
11469
msgid "The date of your Journal Entry is not in the defined period!"
4762
11470
msgstr ""
4763
11471
4764
11472
#. module: account
4765
11473
#: field:account.subscription,period_total:0
4766
11474
msgid "Number of Periods"
4767
11475
>>>>>>> MERGE-SOURCE
4768
10007
msgstr ""
11476
msgstr ""
4769
10008
11477
4770
10009
#. module: account
11478
#. module: account
4771
@@ -10119,6 +11588,7 @@
4772
10119
#: field:account.partner.ledger,result_selection:0
11588
#: field:account.partner.ledger,result_selection:0
4773
10120
#: report:account.third_party_ledger:0
11589
#: report:account.third_party_ledger:0
4774
10121
#: report:account.third_party_ledger_other:0
11590
#: report:account.third_party_ledger_other:0
4775
11591
#: report:account.aged_trial_balance:0
4776
10122
msgid "Partner's"
11592
msgid "Partner's"
4777
10123
msgstr ""
11593
msgstr ""
4778
10124
11594
4779
@@ -10224,6 +11694,7 @@
4780
10224
msgstr ""
11694
msgstr ""
4781
10225
11695
4782
10226
#. module: account
11696
#. module: account
4783
11697
<<<<<<< TREE
4784
10227
#: field:res.partner,property_payment_term:0
11698
#: field:res.partner,property_payment_term:0
4785
10228
msgid "Customer Payment Term"
11699
msgid "Customer Payment Term"
4786
10229
msgstr ""
11700
msgstr ""
4787
@@ -10236,6 +11707,27 @@
4788
10236
#. module: account
11707
#. module: account
4789
10237
#: selection:account.config.settings,tax_calculation_rounding_method:0
11708
#: selection:account.config.settings,tax_calculation_rounding_method:0
4790
10238
msgid "Round per line"
11709
msgid "Round per line"
4791
11710
=======
4792
11711
#: field:account.analytic.line,amount_currency:0
4793
11712
msgid "Amount currency"
4794
11713
msgstr ""
4795
11714
4796
11715
#. module: account
4797
11716
#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
4798
11717
#, python-format
4799
11718
msgid "You must enter a period length that cannot be 0 or below !"
4800
11719
msgstr ""
4801
11720
4802
11721
#. module: account
4803
11722
#: code:addons/account/account.py:511
4804
11723
#, python-format
4805
11724
msgid "You cannot remove an account which has account entries!. "
4806
11725
msgstr ""
4807
11726
4808
11727
#. module: account
4809
11728
#: model:ir.actions.act_window,help:account.action_account_form
4810
11729
msgid "Create and manage the accounts you need to record journal entries. An account is part of a ledger allowing your company to register all kinds of debit and credit transactions. Companies present their annual accounts in two main parts: the balance sheet and the income statement (profit and loss account). The annual accounts of a company are required by law to disclose a certain amount of information. They have to be certified by an external auditor annually."
4811
11730
>>>>>>> MERGE-SOURCE
4812
10239
msgstr ""
11731
msgstr ""
4813
10240
11732
4814
10241
#. module: account
11733
#. module: account
4815
@@ -10243,3 +11735,48 @@
4816
10243
msgid "The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."
11735
msgid "The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."
4817
10244
msgstr ""
11736
msgstr ""
4818
10245
11737
4819
11738
#. module: account
4820
11739
#: report:account.balancesheet.horizontal:0
4821
11740
#: report:account.balancesheet:0
4822
11741
msgid "Assets"
4823
11742
msgstr ""
4824
11743
4825
11744
#. module: account
4826
11745
#: report:account.balancesheet.horizontal:0
4827
11746
#: report:account.balancesheet:0
4828
11747
msgid "Liabilities"
4829
11748
msgstr ""
4830
11749
4831
11750
#. module: account
4832
11751
#: report:account.balancesheet.horizontal:0
4833
11752
#: report:account.balancesheet:0
4834
11753
#: report:pl.account.horizontal:0
4835
11754
#: report:pl.account:0
4836
11755
msgid "Balance:"
4837
11756
msgstr ""
4838
11757
4839
11758
#. module: account
4840
11759
#: report:pl.account.horizontal:0
4841
11760
#: report:pl.account:0
4842
11761
msgid "Particular"
4843
11762
msgstr ""
4844
11763
4845
11764
#. module: account
4846
11765
#: report:account.aged_trial_balance:0
4847
11766
msgid "Aged Trial Balance"
4848
11767
msgstr ""
4849
11768
4850
11769
#. module: account
4851
11770
#: report:account.aged_trial_balance:0
4852
11771
msgid "Period Length(days)"
4853
11772
msgstr ""
4854
11773
4855
11774
#. module: account
4856
11775
#: report:account.aged_trial_balance:0
4857
11776
msgid "Account Total"
4858
11777
msgstr ""
4859
11778
4860
11779
#. module: account
4861
11780
#: report:account.aged_trial_balance:0
4862
11781
msgid "Not due"
4863
11782
msgstr ""
4864
10246
11783
4865
=== modified file 'account/i18n/ar.po'
4866
--- account/i18n/ar.po	2013-04-05 11:10:48 +0000
4867
+++ account/i18n/ar.po	2013-06-03 06:13:34 +0000
4868
@@ -6,19 +6,31 @@
4869
6
msgstr ""
6
msgstr ""
4870
7
"Project-Id-Version: OpenERP Server 6.0dev\n"
7
"Project-Id-Version: OpenERP Server 6.0dev\n"
4871
8
"Report-Msgid-Bugs-To: support@openerp.com\n"
8
"Report-Msgid-Bugs-To: support@openerp.com\n"
4872
9
<<<<<<< TREE
4873
9
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
10
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
4874
10
"PO-Revision-Date: 2012-12-15 22:53+0000\n"
11
"PO-Revision-Date: 2012-12-15 22:53+0000\n"
4875
11
"Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n"
12
"Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n"
4876
13
=======
4877
14
"POT-Creation-Date: 2011-05-09 10:18+0000\n"
4878
15
"PO-Revision-Date: 2012-02-27 19:08+0000\n"
4879
16
"Last-Translator: Pioneer Solutions <wzaki_dotcom@yahoo.com>\n"
4880
17
>>>>>>> MERGE-SOURCE
4881
12
"Language-Team: \n"
18
"Language-Team: \n"
4882
13
"MIME-Version: 1.0\n"
19
"MIME-Version: 1.0\n"
4883
14
"Content-Type: text/plain; charset=UTF-8\n"
20
"Content-Type: text/plain; charset=UTF-8\n"
4884
15
"Content-Transfer-Encoding: 8bit\n"
21
"Content-Transfer-Encoding: 8bit\n"
4885
22
<<<<<<< TREE
4886
16
"X-Launchpad-Export-Date: 2013-03-16 05:12+0000\n"
23
"X-Launchpad-Export-Date: 2013-03-16 05:12+0000\n"
4887
17
"X-Generator: Launchpad (build 16532)\n"
24
"X-Generator: Launchpad (build 16532)\n"
4888
25
=======
4889
26
"X-Launchpad-Export-Date: 2012-08-28 07:37+0000\n"
4890
27
"X-Generator: Launchpad (build 15864)\n"
4891
28
>>>>>>> MERGE-SOURCE
4892
18
29
4893
19
#. module: account
30
#. module: account
4894
20
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
31
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
4895
21
msgid "System payment"
32
msgid "System payment"
4896
33
<<<<<<< TREE
4897
22
msgstr "مدفوعات النظام"
34
msgstr "مدفوعات النظام"
4898
23
35
4899
24
#. module: account
36
#. module: account
4900
@@ -35,11 +47,36 @@
4901
35
msgstr ""
47
msgstr ""
4902
36
"تحديد ترتيب العرض التقرير ’الحسابات/التقارير/ التقارير العمومية/الضرائب/ "
48
"تحديد ترتيب العرض التقرير ’الحسابات/التقارير/ التقارير العمومية/الضرائب/ "
4903
37
"تقرير الضرائب’"
49
"تقرير الضرائب’"
4904
50
=======
4905
51
msgstr "نظام الدفع"
4906
52
4907
53
#. module: account
4908
54
#: view:account.journal:0
4909
55
msgid "Other Configuration"
4910
56
msgstr "إعدادات أخرى"
4911
57
4912
58
#. module: account
4913
59
#: code:addons/account/account.py:506
4914
60
#, python-format
4915
61
msgid ""
4916
62
"You cannot remove/deactivate an account which is set as a property to any "
4917
63
"Partner."
4918
64
msgstr "لايمكن الغاء/تعطيل حساب معد كخاص بأي طرف."
4919
65
>>>>>>> MERGE-SOURCE
4920
38
66
4921
39
#. module: account
67
#. module: account
4922
40
#: view:account.move.reconcile:0
68
#: view:account.move.reconcile:0
4923
41
msgid "Journal Entry Reconcile"
69
msgid "Journal Entry Reconcile"
4925
42
msgstr "تسوية اليومية"
70
<<<<<<< TREE
4926
71
msgstr "تسوية اليومية"
4927
72
=======
4928
73
msgstr "تسوية اليومية"
4929
74
4930
75
#. module: account
4931
76
#: field:account.installer.modules,account_voucher:0
4932
77
msgid "Voucher Management"
4933
78
msgstr "إدارة القسائم"
4934
79
>>>>>>> MERGE-SOURCE
4935
43
80
4936
44
#. module: account
81
#. module: account
4937
45
#: view:account.account:0
82
#: view:account.account:0
4938
@@ -49,25 +86,69 @@
4939
49
msgstr "إحصائيات الحساب"
86
msgstr "إحصائيات الحساب"
4940
50
87
4941
51
#. module: account
88
#. module: account
4942
89
<<<<<<< TREE
4943
52
#: view:account.invoice:0
90
#: view:account.invoice:0
4944
53
msgid "Proforma/Open/Paid Invoices"
91
msgid "Proforma/Open/Paid Invoices"
4945
54
msgstr "الفواتير المبدئية/المفتوحة/المدفوعة"
92
msgstr "الفواتير المبدئية/المفتوحة/المدفوعة"
4946
55
93
4947
56
#. module: account
94
#. module: account
4948
95
=======
4949
96
>>>>>>> MERGE-SOURCE
4950
57
#: field:report.invoice.created,residual:0
97
#: field:report.invoice.created,residual:0
4951
58
msgid "Residual"
98
msgid "Residual"
4952
59
msgstr "متبقي"
99
msgstr "متبقي"
4953
60
100
4954
61
#. module: account
101
#. module: account
4955
102
<<<<<<< TREE
4956
62
#: code:addons/account/account_bank_statement.py:368
103
#: code:addons/account/account_bank_statement.py:368
4957
104
=======
4958
105
#: code:addons/account/account_invoice.py:805
4959
106
>>>>>>> MERGE-SOURCE
4960
63
#, python-format
107
#, python-format
4961
108
<<<<<<< TREE
4962
64
msgid "Journal item \"%s\" is not valid."
109
msgid "Journal item \"%s\" is not valid."
4963
65
msgstr "بند اليومية \"%s\" غير صحيح."
110
msgstr "بند اليومية \"%s\" غير صحيح."
4964
111
=======
4965
112
msgid "Please define sequence on invoice journal"
4966
113
msgstr "يرجى تحديد تسلسل على الفاتورة"
4967
114
4968
115
#. module: account
4969
116
#: constraint:account.period:0
4970
117
msgid "Error ! The duration of the Period(s) is/are invalid. "
4971
118
msgstr "خظأ! إن مدة الفترة أو الفترات غير صالحة "
4972
119
4973
120
#. module: account
4974
121
#: field:account.analytic.line,currency_id:0
4975
122
msgid "Account currency"
4976
123
msgstr "عملة الحساب"
4977
124
4978
125
#. module: account
4979
126
#: view:account.tax:0
4980
127
msgid "Children Definition"
4981
128
msgstr "تعريف فروع"
4982
129
>>>>>>> MERGE-SOURCE
4983
66
130
4984
67
#. module: account
131
#. module: account
4985
68
#: model:ir.model,name:account.model_report_aged_receivable
132
#: model:ir.model,name:account.model_report_aged_receivable
4986
69
msgid "Aged Receivable Till Today"
133
msgid "Aged Receivable Till Today"
4988
70
msgstr "فترة المقبوضات حتى اليوم"
134
<<<<<<< TREE
4989
135
msgstr "فترة المقبوضات حتى اليوم"
4990
136
=======
4991
137
msgstr "فترة المقبوضات حتى اليوم"
4992
138
4993
139
#. module: account
4994
140
#: field:account.partner.ledger,reconcil:0
4995
141
msgid "Include Reconciled Entries"
4996
142
msgstr "إضافة السجلات المسواه"
4997
143
4998
144
#. module: account
4999
145
#: view:account.pl.report:0
5000
146
msgid ""
Reviewer	Review Type	Date Requested	Status
Olivier Dony (Odoo)		2013-02-01	Needs Resubmitting on 2013-06-03
Review via email: mp+146074@code.launchpad.net