[[ data['form']['date1'] ]]
@@ -191,10 +195,10 @@
-
+
|
- Code / Date
+ Code / Date
|
J.C. / Move name
@@ -211,15 +215,13 @@
|
-
+
|
-
-
-
+ Total :
|
- Total:
+
|
[[ '%.2f' % (sum_debit(objects,data['form']['date1'],data['form']['date2']) or 0.0) ]]
@@ -237,7 +239,7 @@
|
[[ repeatIn(objects,'o') ]]
-
+
|
[[ o.code ]]
@@ -259,46 +261,43 @@
|
[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2']),'move_g') ]]
-
+
|
- [[ move_g['code'] ]]
+ [[ move_g['code'] ]]
|
- [[ move_g['name'] ]]
+ [[ move_g['name'] ]]
|
- [[ '%.2f' % move_g['debit'] ]]
+ [[ '%.2f' % move_g['debit'] ]]
|
- [[ '%.2f' % move_g['credit'] ]]
+ [[ '%.2f' % move_g['credit'] ]]
|
- [[ '%.2f' % move_g['balance'] ]]
+ [[ '%.2f' % move_g['balance'] ]]
|
[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]
-
+
|
- [[ move_a['date'] ]]
+ [[ move_a['date'] ]]
|
- [[ move_a['cj'] ]]
+ [[ move_a['cj'] ]] / [[ move_a['name'] ]]
|
- [[ move_a['name'] ]]
+ [[ '%.2f' % move_a['debit'] ]]
|
- [[ '%.2f' % move_a['debit'] ]]
+ [[ '%.2f' % move_a['credit'] ]]
|
- [[ '%.2f' % move_a['credit'] ]]
- |
-
- [[ '%.2f' % move_a['balance'] ]]
+ [[ '%.2f' % move_a['balance'] ]]
|
@@ -319,4 +318,4 @@
-
+
\ No newline at end of file
diff --git a/addons/account/project/report/inverted_analytic_balance.rml b/addons/account/project/report/inverted_analytic_balance.rml
index 63100e50a9d..3453e8f009b 100644
--- a/addons/account/project/report/inverted_analytic_balance.rml
+++ b/addons/account/project/report/inverted_analytic_balance.rml
@@ -17,7 +17,7 @@
[[ company.name ]]
- Inverted Analytic Balance
+ Inverted Analytic Balance - [[ company.currency_id.name ]]
diff --git a/addons/account/project/report/quantity_cost_ledger.rml b/addons/account/project/report/quantity_cost_ledger.rml
index 755ed501fd3..f87c74f4d69 100644
--- a/addons/account/project/report/quantity_cost_ledger.rml
+++ b/addons/account/project/report/quantity_cost_ledger.rml
@@ -132,8 +132,10 @@
-
-
+
+
+
+
@@ -217,12 +219,10 @@
|
-
-
-
+ Total:
|
- Total:
+
|
[[ '%.2f' % (sum_quantity(objects,data['form']['date1'],data['form']['date2'], data['form']['journal']) or 0.0) ]]
@@ -238,7 +238,7 @@
|
- [[ o.code ]]
+ [[ o.code ]]
|
[[ o.complete_name ]]
@@ -257,33 +257,30 @@
|
- [[ move_g['code'] ]]
+ [[ move_g['code'] ]]
|
- [[ move_g['name'] ]]
+ [[ move_g['name'] ]]
|
-
+
|
- [[ '%.2f' % (move_g['quantity'] or 0.0) ]]
+ [[ '%.2f' % (move_g['quantity'] or 0.0) ]]
|
-
+
|
- [[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_a') ]][[ move_a['date'] ]]
+ [[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_a') ]][[ move_a['date'] ]]
|
- [[ move_a['cj'] ]]
- |
-
- [[ move_a['name'] ]]
+ [[ move_a['cj'] ]] / [[ move_a['name'] ]]
|
[[ '%.2f' % (move_a['quantity'] or 0.0 )]]
diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py
index f14ab460225..a3206fbcdf8 100644
--- a/addons/account/report/__init__.py
+++ b/addons/account/report/__init__.py
@@ -40,6 +40,7 @@ import overdue
import aged_trial_balance
import tax_report
import general_ledger_landscape
+import account_tax_code
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index cfabf9d545f..8178d8fa399 100755
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@@ -42,7 +42,7 @@
-
+
@@ -50,7 +50,7 @@
-
+
@@ -80,6 +80,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
| [[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]][[ a['jname'] or removeParentNode('tr') ]] |
- [[ a['level']<4 and removeParentNode('font') or '...'*(2) ]][[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]][ref: [[ a['ref'] or removeParentNode('font') ]] ] [[ a['lname'] ]] |
+ [[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]] [[ setTag('tr','tr',{'style':('TrLevel_Name'+str(a['level']))}) ]][ref: [[ a['ref'] or removeParentNode('font') ]] ] [[ a['lname'] ]] |
[[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit1']) and '%.2f'%a['debit1'] or '0.00']] |
[[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit1']) and '%.2f'%a['credit1'] or '0.00']] |
[[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance1']) and '%.2f'%a['balance1'] or '0.00' ]] |
@@ -277,4 +302,3 @@
-
diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py
index 5110287b2b0..11252b0707a 100644
--- a/addons/account/report/account_journal.py
+++ b/addons/account/report/account_journal.py
@@ -45,12 +45,28 @@ class journal_print(report_sxw.rml_parse):
'sum_credit': self._sum_credit
})
- def lines(self, period_id, journal_id, *args):
+ def lines(self, period_id, journal_id, sort_selection='date', *args):
+ if type(period_id)==type([]):
+ ids_final = []
+ for journal in journal_id:
+ for period in period_id:
+ ids_journal_period = self.pool.get('account.journal.period').search(self.cr,self.uid, [('journal_id','=',journal),('period_id','=',period)])
+ if ids_journal_period:
+ self.cr.execute('update account_journal_period set state=%s where journal_id=%d and period_id=%d and state=%s', ('printed',journal,period,'draft'))
+ self.cr.commit()
+ self.cr.execute('select id from account_move_line where period_id=%d and journal_id=%d and state<>\'draft\' order by ('+ sort_selection +'),id', (period, journal))
+ ids = map(lambda x: x[0], self.cr.fetchall())
+ ids_final.append(ids)
+ line_ids = []
+ for line_id in ids_final:
+ a = self.pool.get('account.move.line').browse(self.cr, self.uid, line_id )
+ line_ids.append(a)
+ return line_ids
self.cr.execute('update account_journal_period set state=%s where journal_id=%d and period_id=%d and state=%s', ('printed',journal_id,period_id,'draft'))
self.cr.commit()
self.cr.execute('select id from account_move_line where period_id=%d and journal_id=%d and state<>\'draft\' order by date,id', (period_id, journal_id))
ids = map(lambda x: x[0], self.cr.fetchall())
- return self.pool.get('account.move.line').browse(self.cr, self.uid, ids)
+ return self.pool.get('account.move.line').browse(self.cr, self.uid, ids )
def _sum_debit(self, period_id, journal_id):
self.cr.execute('select sum(debit) from account_move_line where period_id=%d and journal_id=%d and state<>\'draft\'', (period_id, journal_id))
@@ -59,8 +75,8 @@ class journal_print(report_sxw.rml_parse):
def _sum_credit(self, period_id, journal_id):
self.cr.execute('select sum(credit) from account_move_line where period_id=%d and journal_id=%d and state<>\'draft\'', (period_id, journal_id))
return self.cr.fetchone()[0] or 0.0
-report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print)
-
+report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print,header=False)
+report_sxw.report_sxw('report.account.journal.period.print.wiz', 'account.journal.period', 'addons/account/report/wizard_account_journal.rml', parser=journal_print,header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml
index 0deffbdee64..4831315864a 100644
--- a/addons/account/report/account_journal.rml
+++ b/addons/account/report/account_journal.rml
@@ -3,6 +3,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [[ company.name ]]
+ Print Journal - [[ company.currency_id.name ]]
+
+
+
+
+
+
+ [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]
+ Page
+
+
+
+
+ 1cm 27.7cm 20cm 27.7cm
+
+
+
@@ -13,24 +44,25 @@
-
-
-
+
+
+
+
+
-
+
+
+
+
+
-
-
-
-
-
@@ -38,14 +70,18 @@
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -53,111 +89,102 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
[[ repeatIn(objects, 'o') ]]
-
+
|
-
-
-
+ Date
|
- Journal
+ Voucher No
|
- [[o.period_id.name ]]
+ A/c No.
+ |
+
+ Third party
+ |
+
+ Entry label
+ |
+
+ Debit
+ |
+
+ Credit
|
-
+
|
- [[ company.name ]]
+ [[o.period_id.name ]]
|
- [[ o.journal_id.code ]] [[ o.journal_id.name ]]
+ [[ o.journal_id.code ]] |
+ |
+ |
+ |
+
+ [[ '%.2f' % sum_debit(o.period_id.id, o.journal_id.id) or '0.00' ]]
|
- Currency: [[ company.currency_id.name ]]
+ [[ '%.2f' % sum_credit(o.period_id.id, o.journal_id.id) or '0.00' ]]
|
-
-
+
+ |
+ [[ repeatIn(lines(o.period_id.id, o.journal_id.id), 'line') ]]
+ [[ line.date ]]
+ |
+
+ [[ line.ref ]]
+ |
+
+ [[ line.account_id.code ]]
+ |
+
+ [[ line.partner_id and line.partner_id.name ]]
+ |
+
+ [[ line.name ]]
+ |
+
+ [[ line.debit and '%.2f' % line.debit or '0.00' ]]
+ |
+
+ [[ line.credit and '%.2f' % line.credit or '0.00' ]]
+ |
+
- Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]
-
-
-
-
-
- |
- Date
- |
-
- Voucher Nb
- |
-
- Account Number
- |
-
- Third party
- |
-
- Entry label
- |
-
- Debit
- |
-
- Credit
- |
-
-
- |
-
- [[ repeatIn(lines(o.period_id.id, o.journal_id.id), 'line') ]]
- [[ line.date ]]
-
- |
-
- [[ line.ref ]]
- |
-
- [[ line.account_id.code ]]
- |
-
- [[ line.partner_id and line.partner_id.name ]]
- |
-
- [[ line.name ]]
- |
-
- [[ line.debit and '%.2f' % line.debit or '' ]]
- |
-
- [[ line.credit and '%.2f' % line.credit or '' ]]
- |
-
-
-
-
- |
- TOTAL:
- |
-
- [[ '%.2f' % sum_debit(o.period_id.id, o.journal_id.id) ]]
- |
-
- [[ '%.2f' % sum_credit(o.period_id.id, o.journal_id.id) ]]
- |
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/addons/account/report/account_tax_code.py b/addons/account/report/account_tax_code.py
new file mode 100644
index 00000000000..b236c087949
--- /dev/null
+++ b/addons/account/report/account_tax_code.py
@@ -0,0 +1,19 @@
+import time
+import pooler
+import rml_parse
+import copy
+from report import report_sxw
+import re
+
+class account_tax_code_report(rml_parse.rml_parse):
+ _name = 'report.account.tax.code.entries'
+ def __init__(self, cr, uid, name, context):
+ super(account_tax_code_report, self).__init__(cr, uid, name, context)
+ self.localcontext.update({
+ 'time': time,
+ })
+
+
+report_sxw.report_sxw('report.account.tax.code.entries', 'account.tax.code',
+ 'addons/account/report/account_tax_code.rml', parser=account_tax_code_report, header=False)
+
diff --git a/addons/account/report/account_tax_code.rml b/addons/account/report/account_tax_code.rml
index ade928c8a9d..c33827bf559 100644
--- a/addons/account/report/account_tax_code.rml
+++ b/addons/account/report/account_tax_code.rml
@@ -2,7 +2,31 @@
-
+
+
+
+
+
+
+
+ [[ company.name ]]
+ Accounting Entries-[[ company.currency_id.name ]]
+
+
+
+
+
+ [[ time.strftime("%m-%d-%Y %H:%M", time.localtime()) ]]
+ Page
+
+
+
+
+ 1cm 27.7cm 20cm 27.7cm
+
+
+
+
@@ -10,42 +34,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
@@ -53,113 +64,110 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- [[ repeatIn(objects, 'o') ]]
-
+
+
-
+
+
|
- Date
+ Date
|
- Voucher Nb
+ Voucher Nb
|
- Account Number
+ Account Number
|
- Third party (Country)
+ Third party (Country)
|
- Entry label
+ Entry label
|
- Debit
+ Debit
|
- Credit
+ Credit
|
-
-
+
- |
-
- [[ repeatIn(o.line_ids, 'line') ]]
- [[ line.date ]]
-
- |
-
- [[ line.ref ]]
- |
-
- [[ line.account_id.code ]]
- |
-
- [[ line.partner_id and line.partner_id.name ]] ([[ line.partner_id and line.partner_id.address and line.partner_id.address[0].country_id.code or '' ]] )
- |
-
- [[ line.name ]]
- |
-
- [[ '%.2f' % line.debit ]]
- |
-
- [[ '%.2f' % line.credit ]]
- |
+
+ [[ repeatIn(objects, 'o') ]]
+ [[ repeatIn(o.line_ids, 'line') ]]
+
+
+ |
+ [[ line.date ]]
+ |
+
+ [[ line.ref ]]
+ |
+
+ [[ line.account_id.code ]]
+ |
+
+ [[ line.partner_id and line.partner_id.name ]]([[ line.partner_id and line.partner_id.address and line.partner_id.address[0].country_id.code or removeParentNode('font') ]] )
+ |
+
+ [[ line.name ]]
+ |
+
+ [[ formatLang(line.debit) or '%.2f' % line.debit ]]
+ |
+
+ [[ formatLang(line.credit) or '%.2f' % line.credit ]]
+ |
+
+
+ |
-
-
- |
- TOTAL:
- |
-
-
-
-
- |
-
-
-
-
- |
-
-
-
+
+
diff --git a/addons/account/report/aged_trial_balance.py b/addons/account/report/aged_trial_balance.py
index bd04138c8bf..ee7f5555ae9 100755
--- a/addons/account/report/aged_trial_balance.py
+++ b/addons/account/report/aged_trial_balance.py
@@ -31,13 +31,13 @@ import rml_parse
from report import report_sxw
class aged_trial_report(rml_parse.rml_parse):
-
+
def __init__(self, cr, uid, name, context):
super(aged_trial_report, self).__init__(cr, uid, name, context)
self.line_query = ''
self.total_account = []
-
-
+
+
self.localcontext.update({
'time': time,
'get_lines': self._get_lines,
@@ -46,19 +46,19 @@ class aged_trial_report(rml_parse.rml_parse):
'get_for_period': self._get_for_period,
'get_company': self._get_company,
'get_currency': self._get_currency,
-
+
})
-
-
+
+
def _get_lines(self, form):
-
+
if (form['result_selection'] == 'customer' ):
self.ACCOUNT_TYPE = "('receivable')"
elif (form['result_selection'] == 'supplier'):
self.ACCOUNT_TYPE = "('payable')"
else:
self.ACCOUNT_TYPE = "('payable','receivable')"
-
+
res = []
account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
@@ -78,7 +78,7 @@ class aged_trial_report(rml_parse.rml_parse):
for i in range(7):
self.total_account.append(0)
#
-
+
for partner in partners:
values = {}
## If choise selection is in the future
@@ -94,7 +94,7 @@ class aged_trial_report(rml_parse.rml_parse):
"AND account_account.active",
(form['date1'], partner['id'],form['date1'], form['company_id']))
before = self.cr.fetchone()
-
+
self.total_account[6] = self.total_account[6] + (before and before[0] or 0.0)
values['direction'] = before and before[0] or 0.0
@@ -112,7 +112,6 @@ class aged_trial_report(rml_parse.rml_parse):
after = self.cr.fetchone()
self.total_account[6] = self.total_account[6] + (after and after[0] or 0.0)
values['direction'] = after and after[0] or ""
- #print str(values['direction'])
for i in range(5):
self.cr.execute("SELECT SUM(debit-credit) " \
"FROM account_move_line AS line, account_account " \
@@ -128,8 +127,6 @@ class aged_trial_report(rml_parse.rml_parse):
during = self.cr.fetchone()
# Ajout du compteur
self.total_account[(i)] = self.total_account[(i)] + (during and during[0] or 0)
-
- #print str(during)
values[str(i)] = during and during[0] or ""
self.cr.execute("SELECT SUM(debit-credit) " \
"FROM account_move_line AS line, account_account " \
@@ -145,19 +142,16 @@ class aged_trial_report(rml_parse.rml_parse):
values['total'] = total and total[0] or 0.0
## Add for total
self.total_account[(i+1)] = self.total_account[(i+1)] + (total and total[0] or 0.0)
- print self.total_account,">>>>>>>>>>>>>Total>>>>>>>>>>>>>>>>"
values['name'] = partner['name']
#t = 0.0
#for i in range(5)+['direction']:
# t+= float(values.get(str(i), 0.0) or 0.0)
#values['total'] = t
-
+
if values['total']:
-
res.append(values)
-
+
total = 0.0
-
totals = {}
for r in res:
total += float(r['total'] or 0.0)
@@ -166,24 +160,17 @@ class aged_trial_report(rml_parse.rml_parse):
totals[str(i)] += float(r[str(i)] or 0.0)
return res
-
-
-
def _get_total(self,pos):
- print self.total_account,"========_get_total========"
period = self.total_account[int(pos)]
- return period
+ return period
-
def _get_direction(self,pos):
-
period = self.total_account[int(pos)]
- return period
+ return period
def _get_for_period(self,pos):
-
period = self.total_account[int(pos)]
- return period
+ return period
def _get_company(self, form):
return pooler.get_pool(self.cr.dbname).get('res.company').browse(self.cr, self.uid, form['company_id']).name
@@ -194,5 +181,5 @@ class aged_trial_report(rml_parse.rml_parse):
report_sxw.report_sxw('report.account.aged_trial_balance', 'res.partner',
'addons/account/report/aged_trial_balance.rml',parser=aged_trial_report,header=False)
-
+
diff --git a/addons/account/report/central_journal.py b/addons/account/report/central_journal.py
index c4dab8fc600..7b595a311a7 100644
--- a/addons/account/report/central_journal.py
+++ b/addons/account/report/central_journal.py
@@ -55,7 +55,7 @@ class journal_print(report_sxw.rml_parse):
def _sum_credit(self, period_id, journal_id):
self.cr.execute('select sum(credit) from account_move_line where period_id=%d and journal_id=%d and state<>\'draft\'', (period_id, journal_id))
return self.cr.fetchone()[0] or 0.0
-report_sxw.report_sxw('report.account.central.journal', 'account.journal.period', 'addons/account/report/central_journal.rml',parser=journal_print)
+report_sxw.report_sxw('report.account.central.journal', 'account.journal.period', 'addons/account/report/central_journal.rml',parser=journal_print, header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/central_journal.rml b/addons/account/report/central_journal.rml
index 359465379d2..ade1659de58 100644
--- a/addons/account/report/central_journal.rml
+++ b/addons/account/report/central_journal.rml
@@ -3,6 +3,30 @@
+
+
+
+
+
+
+ [[ company.name ]]
+ Central Journal-[[ company.currency_id.name ]]
+
+
+
+
+
+ [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]
+ Page
+
+
+
+
+ 1cm 27.7cm 20cm 27.7cm
+
+
+
+
@@ -10,44 +34,62 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -55,104 +97,150 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- [[ repeatIn(objects, 'o') ]]
-
+
+
- Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]
-
+
-
+ [[ repeatIn(objects, 'o') ]]
+
|
- Account number
+ Journal Code
|
- Account name
+ Journal Name
|
- Currency
- |
-
- Debit
- |
-
- Credit
+ Printing Date
|
-
+
|
- [[ repeatIn(lines(o.period_id.id, o.journal_id.id), 'line') ]][[ line['code'] ]]
+ [[ o.journal_id.code or '' ]]
|
- [[ line['name'] ]]
+ [[ o.journal_id.name ]]
|
-
-
-
- |
-
- [[ line['debit'] and '%.2f' % line['debit'] or '' ]]
- |
-
- [[ line['credit'] and '%.2f' % line['credit'] or '' ]]
+ [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]
|
-
-
- |
- TOTAL:
- |
-
- [[ '%.2f' % sum_debit(o.period_id.id, o.journal_id.id) ]]
- |
-
- [[ '%.2f' % sum_credit(o.period_id.id, o.journal_id.id) ]]
- |
-
-
-
+
-
-
+
+
+
+
+
+ |
+ Account Num.
+ |
+
+ Account Name
+ |
+
+ Debit
+ |
+
+ Credit
+ |
+
+
+
+
+
+
+ |
+ Total:
+ |
+
+
+
+
+ |
+
+ [[ '%.2f' % sum_debit(o.period_id.id, o.journal_id.id) ]]
+ |
+
+ [[ '%.2f' % sum_credit(o.period_id.id, o.journal_id.id) ]]
+ |
+
+
+ |
+
+
+
+
+ [[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]]
+
+
+ |
+ [[ line['code'] ]]
+ |
+
+ [[ line['name'] ]]
+ |
+
+ [[ formatLang(line['debit']) and '%.2f' % line['debit'] or '0.00' ]]
+ |
+
+ [[ formatLang(line['credit']) and '%.2f' % line['credit'] or '0.00' ]]
+ |
+
+
+ |
+
+
+
-
diff --git a/addons/account/report/general_journal.py b/addons/account/report/general_journal.py
index 9233a98b765..8899977e17a 100644
--- a/addons/account/report/general_journal.py
+++ b/addons/account/report/general_journal.py
@@ -96,7 +96,7 @@ class journal_print(report_sxw.rml_parse):
return 0.0
self.cr.execute('select sum(credit) from account_move_line where period_id in (' + self.period_ids + ') and journal_id in (' + self.journal_ids + ') and state<>\'draft\'')
return self.cr.fetchone()[0] or 0.0
-report_sxw.report_sxw('report.account.general.journal', 'account.journal.period', 'addons/account/report/general_journal.rml',parser=journal_print)
+report_sxw.report_sxw('report.account.general.journal', 'account.journal.period', 'addons/account/report/general_journal.rml',parser=journal_print, header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/general_journal.rml b/addons/account/report/general_journal.rml
index 8de0f1a82ea..f89c7d201b6 100644
--- a/addons/account/report/general_journal.rml
+++ b/addons/account/report/general_journal.rml
@@ -1,8 +1,32 @@
-
+
-
+
+
+
+
+
+
+
+ [[ company.name ]]
+ General Journal - [[ company.currency_id.name ]]
+
+
+
+
+
+ [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]
+ Page
+
+
+
+
+ 1cm 27.7cm 20cm 27.7cm
+
+
+
+
@@ -10,174 +34,215 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
|
- [[ company.name ]]
+ Printing Date :
|
-
-
-
- |
-
- Currency: [[ company.currency_id.name ]]
+ [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]
|
-
+
- Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]
-
-
-
-
-
- |
- Journal code
- |
-
- Journal name
- |
-
- Period
- |
-
- Debit trans.
- |
-
- Credit trans.
- |
-
-
-
+
- [[ repeatIn( periods(objects), 'o') ]]
-
-
- |
-
- [[ repeatIn(lines(o.id), 'line') ]]
- [[ line['code'] ]]
-
- |
-
- [[ line['name'] ]]
- |
-
- [[ o.name ]]
- |
-
- [[ line['debit'] and ('%.2f' % line['debit']) or '' ]]
- |
-
- [[ line['credit'] and ('%.2f' % line['credit']) or '' ]]
- |
-
-
-
-
- |
- Total [[ o.name ]]
- |
-
- [[ '%.2f' % sum_debit_period(o.id) ]]
- |
-
- [[ '%.2f' % sum_credit_period(o.id) ]]
- |
-
-
-
-
-
-
-
-
-
-
+
|
- TOTAL:
+ Jrl Code
|
- [[ '%.2f' % sum_debit() ]]
+ Journal Name
|
- [[ '%.2f' % sum_credit() ]]
+ Period
+ |
+
+ Debit Trans.
+ |
+
+ Credit Trans.
|
-
-
+
+
+
+
+
+ |
+ Total:
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+ [[ '%.2f' % sum_debit() ]]
+ |
+
+ [[ '%.2f' % sum_credit() ]]
+ |
+
+
+ |
+
+
+
+
+ [[ repeatIn( periods(objects), 'o') ]]
+
+
+ |
+ [[ o.name ]] :
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+ [[ '%.2f' % sum_debit_period(o.id) ]]
+ |
+
+ [[ '%.2f' % sum_credit_period(o.id) ]]
+ |
+
+
+
+
+
+ |
+ [[ repeatIn(lines(o.id),'line')]][[ line['code'] ]]
+ |
+
+ [[ line['name'] ]]
+ |
+
+ [[ o.name ]]
+ |
+
+ [[ line['debit'] and ('%.2f' % line['debit']) or '' ]]
+ |
+
+ [[ line['credit'] and ('%.2f' % line['credit']) or '' ]]
+ |
+
+
+ |
+
+
+ |
+
+
+
+
-
diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml
index 15be15e7be9..20817dff3f3 100755
--- a/addons/account/report/general_ledger.rml
+++ b/addons/account/report/general_ledger.rml
@@ -16,14 +16,14 @@
[[ company.name ]]
- General Ledger
+ General Ledger - [[ company.currency_id.name ]]
[[ time.strftime("%d-%m-%Y %H:%M", time.localtime()) ]]
Page
-
+
1cm 27.7cm 20cm 27.7cm
@@ -32,29 +32,29 @@
-
+
-
+
-
+
-
-
+
+
-
-
+
+
@@ -91,7 +91,7 @@
- [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+ [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
|
Date
@@ -122,7 +122,7 @@
[[ repeatIn(objects, 'a') ]]
[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]
|
-
+
|
@@ -139,7 +139,7 @@
[[sum_solde_account(o, data['form']) or '0.0' ]]
|
-
+
|
@@ -147,7 +147,7 @@
|
|
-
+
Balance Initial
|
@@ -169,13 +169,13 @@
[[ (o.init_debit - o.init_credit) or '0.0' ]]
|
-
+
[[ repeatIn(lines(o, data['form']), 'line') ]]
|
[[ line['date'] ]]
|
-
+
[[ line['partner'] ]]
|
@@ -197,14 +197,14 @@
[[ line['progress'] and line['progress'] or '0.0' ]]
|
-
+
-
- [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+
+ [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
|
Date
@@ -229,17 +229,17 @@
|
Balance
- |
+
Currency
- |
-
+
+
[[ repeatIn(objects, 'a') ]]
[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]
-
+
|
@@ -256,18 +256,18 @@
[[sum_solde_account(o, data['form']) or '0.0' ]]
|
-
+
[[ sum_currency_amount_account(a, data['form']) or '0.0' ]]
|
-
+
|
[[ data['form']['soldeinit'] == True or removeParentNode('tr') ]]
|
|
-
+
Balance Initial
|
@@ -292,7 +292,7 @@
|
-
+
[[ repeatIn(lines(o, data['form']), 'line') ]]
|
@@ -323,15 +323,15 @@
[[ line['amount_currency'] or '0.0' ]] [[ line['currency_code'] ]]
|
-
+
-
+
-
+
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/addons/account/report/general_ledger_landscape.py b/addons/account/report/general_ledger_landscape.py
index f090b18c090..a091ec905dd 100755
--- a/addons/account/report/general_ledger_landscape.py
+++ b/addons/account/report/general_ledger_landscape.py
@@ -35,8 +35,8 @@ import pooler
class general_ledger_landscape(rml_parse.rml_parse):
_name = 'report.account.general.ledger_landscape'
-
-
+
+
def preprocess(self, objects, data, ids):
##
self.borne_date = self.get_min_date(data['form'])
@@ -46,18 +46,18 @@ class general_ledger_landscape(rml_parse.rml_parse):
new_ids = ids
else:
new_ids.append(data['form']['Account_list'])
-
+
objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
-
- super(general_ledger_landscape, self).preprocess(objects, data, new_ids)
-
+
+ super(general_ledger_landscape, self).preprocess(objects, data, new_ids)
+
def __init__(self, cr, uid, name, context):
super(general_ledger_landscape, self).__init__(cr, uid, name, context)
self.query = ""
self.child_ids = ""
self.tot_currency = 0.0
self.period_sql = ""
- self.sold_accounts = {}
+ self.sold_accounts = {}
self.localcontext.update( {
'time': time,
'lines': self.lines,
@@ -66,7 +66,7 @@ class general_ledger_landscape(rml_parse.rml_parse):
'sum_solde_account': self._sum_solde_account,
'sum_debit': self._sum_debit,
'sum_credit': self._sum_credit,
- 'sum_solde': self._sum_solde,
+ 'sum_solde': self._sum_solde,
'get_children_accounts': self.get_children_accounts,
'sum_currency_amount_account': self._sum_currency_amount_account
})
@@ -75,7 +75,7 @@ class general_ledger_landscape(rml_parse.rml_parse):
result = {}
#for id in ids:
# result.setdefault(id, False)
-
+
for account_line in self.pool.get('account.move.line').browse(cr, uid, ids, context):
# For avoid long text in the field we will limit it to 5 lines
#
@@ -85,7 +85,7 @@ class general_ledger_landscape(rml_parse.rml_parse):
num_id_move = str(account_line.move_id.id)
num_id_line = str(account_line.id)
account_id = str(account_line.account_id.id)
- # search the basic account
+ # search the basic account
# We have the account ID we will search all account move line from now until this time
# We are in the case of we are on the top of the account move Line
cr.execute('SELECT distinct(ac.code) as code_rest,ac.name as name_rest from account_account AS ac, account_move_line mv\
@@ -103,10 +103,8 @@ class general_ledger_landscape(rml_parse.rml_parse):
result[account_line.id] = concat + '...'
break
rup_id+=1
-
- #print str(result)
return result
-
+
def get_min_date(self,form):
## Get max born from account_fiscal year
#
@@ -123,9 +121,9 @@ class general_ledger_landscape(rml_parse.rml_parse):
periods = form['periods'][0][2]
if not periods:
sql = """
- Select min(p.date_start) from account_period as p where p.fiscalyear_id = """ + str(form['fiscalyear']) + """
+ Select min(p.date_start) from account_period as p where p.fiscalyear_id = """ + str(form['fiscalyear']) + """
"""
- else:
+ else:
periods_id = ','.join(map(str, periods))
sql = """
Select min(p.date_start) from account_period as p where p.id in ( """ + periods_id + """)
@@ -141,30 +139,30 @@ class general_ledger_landscape(rml_parse.rml_parse):
}
return date_borne
-
-
+
+
def get_children_accounts(self, account, form):
-
-
+
+
self.child_ids = self.pool.get('account.account').search(self.cr, self.uid,
[('parent_id', 'child_of', self.ids)])
-#
+#
res = []
ctx = self.context.copy()
## We will make the test for period or date
## We will now make the test
#
- if form.has_key('fiscalyear'):
+ if form.has_key('fiscalyear'):
ctx['fiscalyear'] = form['fiscalyear']
ctx['periods'] = form['periods'][0][2]
else:
ctx['date_from'] = form['date_from']
ctx['date_to'] = form['date_to']
##
-
+
#
self.query = self.pool.get('account.move.line')._query_get(self.cr, self.uid, context=ctx)
-
+
for child_id in self.pool.get('account.account').search(self.cr, self.uid,[('parent_id', 'child_of', [account.id])]):
child_account = self.pool.get('account.account').browse(self.cr, self.uid, child_id)
sold_account = self._sum_solde_account(child_account,form)
@@ -175,7 +173,6 @@ class general_ledger_landscape(rml_parse.rml_parse):
[('account_id','=',child_account.id)],
context=ctx)) <> 0 :
res.append(child_account)
- #print "Type de vue :" + form['display_account']
elif form['display_account'] == 'bal_solde':
if child_account.type != 'view' \
and len(self.pool.get('account.move.line').search(self.cr, self.uid,
@@ -183,7 +180,7 @@ class general_ledger_landscape(rml_parse.rml_parse):
context=ctx)) <> 0 :
if ( sold_account <> 0.0):
res.append(child_account)
- else:
+ else:
if child_account.type != 'view' \
and len(self.pool.get('account.move.line').search(self.cr, self.uid,
[('account_id','=',child_account.id)],
@@ -205,17 +202,17 @@ class general_ledger_landscape(rml_parse.rml_parse):
sum_credit = 0
else:
sum_credit = resultat[0]['sum_credit']
-
+
move.init_credit = sum_credit
move.init_debit = sum_debit
-
+
else:
move.init_credit = 0
move.init_debit = 0
-
+
##
return res
-
+
def lines(self, account, form):
inv_types = {
'out_invoice': 'CI: ',
@@ -229,9 +226,9 @@ class general_ledger_landscape(rml_parse.rml_parse):
else:
sorttag = 'j.code'
sql = """
- SELECT l.id, l.date, j.code,c.code AS currency_code,l.amount_currency,l.ref, l.name, l.debit, l.credit, l.period_id
+ SELECT l.id, l.date, j.code,c.code AS currency_code,l.amount_currency,l.ref, l.name, l.debit, l.credit, l.period_id
FROM account_move_line l LEFT JOIN res_currency c on (l.currency_id=c.id) JOIN account_journal j on (l.journal_id=j.id)
- AND account_id = %d AND %s
+ AND account_id = %d AND %s
ORDER by %s"""%(account.id,self.query,sorttag)
self.cr.execute(sql)
res = self.cr.dictfetchall()
@@ -258,11 +255,11 @@ class general_ledger_landscape(rml_parse.rml_parse):
if (l['credit'] > 0):
if l['amount_currency'] != None:
l['amount_currency'] = abs(l['amount_currency']) * -1
-
+
#
if l['amount_currency'] != None:
- self.tot_currency = self.tot_currency + l['amount_currency']
-
+ self.tot_currency = self.tot_currency + l['amount_currency']
+
return res
def _sum_debit_account(self, account, form):
@@ -291,7 +288,7 @@ class general_ledger_landscape(rml_parse.rml_parse):
sum_credit += account.init_credit
#
##
-
+
return sum_credit
def _sum_solde_account(self, account, form):
@@ -301,7 +298,7 @@ class general_ledger_landscape(rml_parse.rml_parse):
sum_solde = self.cr.fetchone()[0] or 0.0
if form['soldeinit']:
sum_solde += account.init_debit - account.init_credit
-
+
return sum_solde
def _sum_debit(self, form):
@@ -330,31 +327,24 @@ class general_ledger_landscape(rml_parse.rml_parse):
self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_solde "\
"FROM account_move_line l "\
"WHERE l.account_id in ("+','.join(map(str, self.child_ids))+") AND "+self.query)
-# print ("SELECT (sum(debit) - sum(credit)) as Test "\
-# "FROM account_move_line l "\
-# "WHERE l.account_id in ("+','.join(map(str, child_ids))+") AND "+query+period_sql)
sum_solde = self.cr.fetchone()[0] or 0.0
return sum_solde
-
+
def _set_get_account_currency_code(self, account_id):
- print"====account_id=====",account_id
self.cr.execute("SELECT c.code as code "\
"FROM res_currency c,account_account as ac "\
"WHERE ac.id = %s AND ac.currency_id = c.id"%(account_id))
result = self.cr.fetchone()
- print"====result====",result
if result:
self.account_currency = result[0]
else:
self.account_currency = False
-
-
+
def _sum_currency_amount_account(self, account, form):
-
self._set_get_account_currency_code(account.id)
self.cr.execute("SELECT sum(aml.amount_currency) FROM account_move_line as aml,res_currency as rc WHERE aml.currency_id = rc.id AND aml.account_id= %d "%account.id)
total = self.cr.fetchone()
-
+
if self.account_currency:
return_field = str(total[0]) + self.account_currency
return return_field
diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml
index 439dff350bb..16ddfa9a594 100755
--- a/addons/account/report/general_ledger_landscape.rml
+++ b/addons/account/report/general_ledger_landscape.rml
@@ -16,7 +16,7 @@
[[ company.name ]]
- General Ledger
+ General Ledger - [[ company.currency_id.name ]]
@@ -24,39 +24,39 @@
Page
-
+
1.3cm 24.9cm 38.3cm 24.9cm
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
@@ -92,10 +92,10 @@
-
-
- [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
-
+
+
+ [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+
|
@@ -145,10 +145,10 @@
|
[[ repeatIn(objects, 'a') ]]
[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]
-
+
-
-
+
+
|
@@ -165,18 +165,18 @@
[[ sum_solde_account(o, data['form']) or '0.0' ]]
|
-
+
[[ sum_currency_amount_account(o, data['form']) or '0.0' ]]
|
-
+
|
[[ data['form']['soldeinit'] == True or removeParentNode('tr') ]]
|
Balance Initial
|
-
+
|
@@ -207,13 +207,13 @@
|
-
-
-
+
+ |
+
[[ repeatIn(lines(o, data['form']), 'line') ]]
|
-
+
[[ line['date'] ]]
|
@@ -247,17 +247,17 @@
[[ line['amount_currency'] or '0.0' ]] [[ line['currency_code'] ]]
|
-
-
+
+
|
-
-
-
+
+
+
-
-
- [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+
+
+ [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
|
@@ -320,7 +320,7 @@
Balance
|
-
+
|
[[ repeatIn(objects, 'a') ]]
@@ -342,14 +342,14 @@
[[sum_solde_account(o, data['form']) or '0.0' ]]
|
-
+
|
[[ data['form']['soldeinit'] == True or removeParentNode('tr') ]]
|
|
-
+
Solde Initial
|
@@ -368,7 +368,7 @@
|
-
+
[[ o.init_debit or '0.0' ]]
|
@@ -378,7 +378,7 @@
[[ o.init_debit - o.init_credit or '0.0' ]]
|
-
+
[[ repeatIn(lines(o, data['form']), 'line') ]]
|
@@ -412,15 +412,15 @@
[[ line['progress'] and line['progress'] or '0.0' ]]
|
-
-
+
+
|
-
+
-
-
+
+
-
+
\ No newline at end of file
diff --git a/addons/account/report/overdue.rml b/addons/account/report/overdue.rml
index f9f213f0d89..aa0d111b28f 100644
--- a/addons/account/report/overdue.rml
+++ b/addons/account/report/overdue.rml
@@ -14,195 +14,193 @@
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- [[ repeatIn(objects,'o') ]]
- [[ setLang(o.lang) ]]
+ [[ repeatIn(objects,'o') ]]
+ [[ setLang(o.lang) ]]
|
-
+
|
- [[ o.name ]]
- [[ adr_get(o, 'invoice')['name'] ]]
- [[ adr_get(o, 'invoice')['street'] ]]
- [[ adr_get(o, 'invoice')['zip'] ]] [[ adr_get(o, 'invoice')['city'] ]]
- [[ adr_get(o, 'invoice')['country_id'] and adr_get(o, 'invoice')['country_id'][1] ]]
-
+ [[ o.name ]]
+ [[ adr_get(o, 'invoice')['name'] ]]
+ [[ adr_get(o, 'invoice')['street'] ]]
+ [[ adr_get(o, 'invoice')['zip'] ]] [[ adr_get(o, 'invoice')['city'] ]]
+ [[ adr_get(o, 'invoice')['country_id'] and adr_get(o, 'invoice')['country_id'][1] ]]
+
- VAT: [[ o.vat or removeParentNode('para') ]]
+ VAT: [[ o.vat or removeParentNode('para') ]]
|
+
+
+
+
+
+
+ Document: Customer account statement
-
+ Date:
+ [[ time.strftime('%d/%m/%Y') ]]
-
-
-
- Document: Customer account statement
-
- Date:
- [[ time.strftime('%d/%m/%Y') ]]
-
- Customer Ref: [[ o.id ]]
-
-
-
- Dear Sir/Madam,
-
-
-
- Exception made of a mistake of our side, it seems that the following bills stay unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days.
-
-
-
- Would your payment have been carried out after this mail was sent, please consider the present one as void. Do not hesitate to contact our accounting departement at [[ tel_get(company.partner_id) ]].
-
-
-
- Best regards.
+ Customer Ref: [[ o.id ]]
-
+ Dear Sir/Madam,
+
+
+
+ Exception made of a mistake of our side, it seems that the following bills stay unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days.
+
+
+
+ Would your payment have been carried out after this mail was sent, please consider the present one as void. Do not hesitate to contact our accounting departement at +32 81 81 37 00.
+
+
+
+ Best regards.
+
+
+
+
|
- Date
+ Date
|
- Description
+ Description
|
- Ref
+ Ref
|
- Maturity date
+ Maturity date
|
- Due
+ Due
|
- Paid
+ Paid
|
- Maturity
+ Maturity
|
- Li.
+ Li.
|
-
+
|
-
- [[repeatIn(getLines(o), 'line') ]]
- [[ line['date'] ]]
-
+ Sub-Total:
+ |
+ |
+ |
+ |
+
+ [[ '%.2f' % (reduce(lambda x, y: x + (y['debit'] * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0)) ]]
|
- [[ line['name'] ]]
+ [[ '%.2f' % (reduce(lambda x ,y: x + (y['credit'] * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0)) ]]
|
- [[ line['ref'] ]]
+ [[ '%.2f' % (reduce(lambda x, y: x + ((y['debit'] - y['credit']) * (y['account_id']['type'] == 'payable' and -1 or 1)), filter(lambda x: x['date_maturity'] < time.strftime('%Y-%m-%d'), getLines(o)), 0)) ]]
|
- [[ line['date_maturity'] ]]
- |
-
- [[ line['debit'] and '%.2f' % (line['debit'] * (line['account_id']['type'] == 'payable' and -1 or 1)) or '' ]]
- |
-
- [[ line['credit'] and '%.2f' % (line['credit'] * (line['account_id']['type'] == 'payable' and -1 or 1)) or '' ]]
- |
-
- [[ (line['date_maturity'] < time.strftime('%Y-%m-%d')) and '%.2f' % ((line['debit'] - line['credit']) * (line['account_id']['type'] == 'payable' and -1 or 1)) or '' ]]
- |
-
- [[ line['blocked'] and 'X' or '' ]]
- |
-
-
-
-
- |
- Sub-Total:
- |
-
- [[ '%.2f' % (reduce(lambda x, y: x + (y['debit'] * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0)) ]]
- |
-
-
- [[ '%.2f' % (reduce(lambda x ,y: x + (y['credit'] * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0)) ]]
-
- |
-
- [[ '%.2f' % (reduce(lambda x, y: x + ((y['debit'] - y['credit']) * (y['account_id']['type'] == 'payable' and -1 or 1)), filter(lambda x: x['date_maturity'] < time.strftime('%Y-%m-%d'), getLines(o)), 0)) ]]
- |
-
-
+
|
|
- Balance:
+ Balance:
+ |
+ |
+ |
+ |
+
+ [[ '%.2f' % (reduce(lambda x, y: x +((y['debit'] - y['credit']) * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0)) ]]
|
- [[ '%.2f' % (reduce(lambda x, y: x +((y['debit'] - y['credit']) * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0)) ]]
+
+
+
|
@@ -210,27 +208,52 @@
|
-
+
|
+
+
+
+ |
+
+ [[repeatIn(getLines(o), 'line') ]]
+ [[ line['date'] ]]
+
+ |
-
-
-
+ [[ line['name'] ]]
+ |
+
+ [[ line['ref'] ]]
+ |
+
+ [[ line['date_maturity'] ]]
+ |
+
+ [[ line['debit'] and '%.2f' % (line['debit'] * (line['account_id']['type'] == 'payable' and -1 or 1)) or '' ]]
+ |
+
+ [[ line['credit'] and '%.2f' % (line['credit'] * (line['account_id']['type'] == 'payable' and -1 or 1)) or '' ]]
+ |
+
+ [[ (line['date_maturity'] < time.strftime('%Y-%m-%d')) and '%.2f' % ((line['debit'] - line['credit']) * (line['account_id']['type'] == 'payable' and -1 or 1)) or '' ]]
+ |
+
+ [[ line['blocked'] and 'X' or '' ]]
|
-
+
-
- Total amount due:
- [[ '%.2f' % (reduce(lambda x, y: x + ((y['debit'] - y['credit']) * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0)) ]] [[ company.currency_id.name ]].
+
+ Total amount due:
+ [[ '%.2f' % (reduce(lambda x, y: x + ((y['debit'] - y['credit']) * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0)) ]] [[ company.currency_id.name ]]
+ .
-
+
-
diff --git a/addons/account/report/partner_balance.py b/addons/account/report/partner_balance.py
index e7313354aea..519456527c8 100644
--- a/addons/account/report/partner_balance.py
+++ b/addons/account/report/partner_balance.py
@@ -67,10 +67,13 @@ class partner_balance(report_sxw.rml_parse):
return full_str_date
#
+
+
def transform_period_into_date_array(self,data):
## Get All Period Date
#
# If we have no period we will take all perdio in the FiscalYear.
+ print"data['form']['periods'][0][2]",data['form']['periods'][0][2]
if not data['form']['periods'][0][2] :
periods_id = self.pool.get('account.period').search(self.cr, self.uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
else:
@@ -79,7 +82,6 @@ class partner_balance(report_sxw.rml_parse):
for period_id in periods_id:
period_obj = self.pool.get('account.period').browse(self.cr, self.uid, period_id)
date_array = date_array + self.date_range(period_obj.date_start,period_obj.date_stop)
-
self.date_lst = date_array
self.date_lst.sort()
@@ -89,7 +91,54 @@ class partner_balance(report_sxw.rml_parse):
self.date_lst = return_array
self.date_lst.sort()
-
+ def transform_both_into_date_array(self,data):
+ if not data['form']['periods'][0][2] :
+ periods_id = self.pool.get('account.period').search(self.cr, self.uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
+ else:
+ periods_id = data['form']['periods'][0][2]
+ date_array = []
+ for period_id in periods_id:
+ period_obj = self.pool.get('account.period').browse(self.cr, self.uid, period_id)
+ date_array = date_array + self.date_range(period_obj.date_start,period_obj.date_stop)
+
+ period_start_date = date_array[0]
+ date_start_date = data['form']['date1']
+ period_stop_date = date_array[-1]
+ date_stop_date = data['form']['date2']
+
+ if period_start_date sum(credit) " \
@@ -178,6 +245,7 @@ class partner_balance(report_sxw.rml_parse):
#
#
#
+
self.cr.execute(
"SELECT p.ref,l.account_id,ac.name as account_name,ac.code as code ,p.name, sum(debit) as debit, sum(credit) as credit, " \
"CASE WHEN sum(debit) > sum(credit) " \
@@ -202,7 +270,7 @@ class partner_balance(report_sxw.rml_parse):
"GROUP BY p.id, p.ref, p.name,l.account_id,ac.name,ac.code " \
"ORDER BY l.account_id,p.name")
res = self.cr.dictfetchall()
- print"=====res=====",res
+
for r in res:
full_account.append(r)
@@ -229,18 +297,19 @@ class partner_balance(report_sxw.rml_parse):
new_header['ref'] = ''
new_header['name'] = r['account_name']
new_header['code'] = r['code']
- new_header['debit'] = 0
- new_header['credit'] = 0
- new_header['scredit'] = 0
- new_header['sdebit'] = 0
- new_header['enlitige'] = 0
- new_header['balance'] = 0
+ new_header['debit'] = tot_debit
+ new_header['credit'] = tot_credit
+ new_header['scredit'] = tot_scredit
+ new_header['sdebit'] = tot_sdebit
+ new_header['enlitige'] = tot_enlitige
+ new_header['balance'] = float(tot_sdebit) - float(tot_scredit)
new_header['type'] = 3
##
completearray.append(new_header)
#
r['type'] = 1
r['balance'] = float(r['sdebit']) - float(r['scredit'])
+
completearray.append(r)
#
tot_debit = r['debit']
@@ -252,21 +321,27 @@ class partner_balance(report_sxw.rml_parse):
else:
if cleanarray[i]['account_id'] <> cleanarray[i-1]['account_id']:
##
- new_tot = {}
- new_tot['ref'] = 'Total'
- new_tot['name'] = cleanarray[i-1]['account_name']
- new_tot['code'] = cleanarray[i-1]['code']
-
- new_tot['debit'] = tot_debit
- new_tot['credit'] = tot_credit
- new_tot['scredit'] = tot_scredit
- new_tot['sdebit'] = tot_sdebit
- new_tot['enlitige'] = tot_enlitige
- new_tot['balance'] = float(tot_sdebit) - float(tot_scredit)
- new_tot['type'] = 3
- ##
- completearray.append(new_tot)
-
+# new_tot = {}
+# new_tot['ref'] = 'Total'
+# new_tot['name'] = cleanarray[i-1]['account_name']
+# new_tot['code'] = cleanarray[i-1]['code']
+#
+# new_tot['debit'] = tot_debit
+# new_tot['credit'] = tot_credit
+# new_tot['scredit'] = tot_scredit
+# new_tot['sdebit'] = tot_sdebit
+# new_tot['enlitige'] = tot_enlitige
+# new_tot['balance'] = float(tot_sdebit) - float(tot_scredit)
+# new_tot['type'] = 3
+# ##
+# completearray.append(new_tot)
+ new_header['debit'] = tot_debit
+ new_header['credit'] = tot_credit
+ new_header['scredit'] = tot_scredit
+ new_header['sdebit'] = tot_sdebit
+ new_header['enlitige'] = tot_enlitige
+ new_header['balance'] = float(tot_sdebit) - float(tot_scredit)
+ new_header['type'] = 3
# we reset the counter
tot_debit = r['debit']
tot_credit = r['credit']
@@ -279,12 +354,12 @@ class partner_balance(report_sxw.rml_parse):
new_header['ref'] = ''
new_header['name'] = r['account_name']
new_header['code'] = r['code']
- new_header['debit'] = 0
- new_header['credit'] = 0
- new_header['scredit'] = 0
- new_header['sdebit'] = 0
- new_header['enlitige'] = 0
- new_header['balance'] = 0
+ new_header['debit'] = tot_debit
+ new_header['credit'] = tot_credit
+ new_header['scredit'] = tot_scredit
+ new_header['sdebit'] = tot_sdebit
+ new_header['enlitige'] = tot_enlitige
+ new_header['balance'] = float(tot_sdebit) - float(tot_scredit)
new_header['type'] = 3
##
##
@@ -296,8 +371,10 @@ class partner_balance(report_sxw.rml_parse):
r['balance'] = float(r['sdebit']) - float(r['scredit'])
#
completearray.append(r)
+
if cleanarray[i]['account_id'] == cleanarray[i-1]['account_id']:
# we reset the counter
+
tot_debit = tot_debit + r['debit']
tot_credit = tot_credit + r['credit']
tot_scredit = tot_scredit + r['scredit']
@@ -308,8 +385,11 @@ class partner_balance(report_sxw.rml_parse):
#
r['balance'] = float(r['sdebit']) - float(r['scredit'])
#
+
completearray.append(r)
+
i = i + 1
+
return completearray
@@ -320,6 +400,7 @@ class partner_balance(report_sxw.rml_parse):
result_tmp = 0.0
#
#
+
if data['form']['soldeinit'] :
self.cr.execute(
'SELECT sum(debit) ' \
@@ -443,17 +524,21 @@ class partner_balance(report_sxw.rml_parse):
# ' account_id IN (' + self.account_ids + ') ' \
'l.date IN (' + self.date_lst_string + ') ' \
'GROUP BY partner_id')
-
+ a = self.cr.fetchone()[0]
+ print"====self.cr.fetchone()====",a
if self.cr.fetchone() != None:
- result_tmp = result_tmp + float(self.cr.fetchone()[0] or 0.0)
+ result_tmp = result_tmp + (a or 0.0)
else:
result_tmp = 0.0
+
return result_tmp
def _sum_scredit(self,data):
+
if not self.ids:
return 0.0
account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
+
result_tmp = 0.0
#
#
@@ -470,8 +555,9 @@ class partner_balance(report_sxw.rml_parse):
'AND l.reconcile_id IS NULL ' \
'GROUP BY partner_id',
(self.date_lst[0],))
+ print"self.cr.fetchone()[0]",self.cr.fetchone()
if self.cr.fetchone() != None:
- result_tmp = float(self.cr.fetchone()[0])
+ result_tmp = float(self.cr.fetchone()[0]) or 0.0
else:
result_tmp = 0.0
#
@@ -486,9 +572,10 @@ class partner_balance(report_sxw.rml_parse):
# ' account_id IN (' + self.account_ids + ') ' \
'l.date IN (' + self.date_lst_string + ') ' \
'GROUP BY partner_id')
-
+ a = self.cr.fetchone()[0]
if self.cr.fetchone() != None:
- result_tmp = result_tmp + float(self.cr.fetchone()[0] or 0.0)
+ result_tmp = result_tmp + (a or 0.0)
+
else:
result_tmp = 0.0
diff --git a/addons/account/report/partner_balance.rml b/addons/account/report/partner_balance.rml
index 5e99323bb09..561eb07f505 100644
--- a/addons/account/report/partner_balance.rml
+++ b/addons/account/report/partner_balance.rml
@@ -3,6 +3,7 @@
+
@@ -16,22 +17,23 @@
[[ company.name ]]
- Third Party Balance [[ data['form']['result_selection'] == 'customer' and '/ Débiteur' ]] [[ data['form']['result_selection'] == 'supplier' and '/ Créancier' ]] [[ data['form']['result_selection'] == 'all' and '/ Créancier et Débiteur' ]] - [[ get_currency(data['form']) ]]
-
-
-
-
-
- [[ time.strftime("%m-%d-%y %H:%M", time.localtime()) ]]
- Page
+ Partnar Balance [[ data['form']['result_selection'] == 'customer' and '/ Débiteur' ]] [[ data['form']['result_selection'] == 'supplier' and '/ Créancier' ]] [[ data['form']['result_selection'] == 'all' and '/ Créancier et Débiteur' ]] [[ company.currency_id.name ]]
+
+
+
+
+
+ [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]
+ Page
-
+
1cm 27.7cm 20cm 27.7cm
-
+
+
@@ -55,11 +57,13 @@
-
-
-
-
-
+
+
+
+
+
@@ -76,24 +80,29 @@
-
+
-
-
+
-
-
+
+
+
+
+
+
+
-
-
+
+
+
@@ -103,106 +112,273 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
|
- Grand total
- |
-
- [[ comma_me(sum_debit(data)) ]]
- |
-
- [[ comma_me(sum_credit(data)) ]]
- |
-
- [[ comma_me(sum_sdebit(data)) ]]
- |
-
- [[ comma_me(sum_scredit(data)) ]]
- |
-
- [[ comma_me(sum_litige(data)) ]]
- |
-
-
- |
- Balance
- |
-
-
-
-
- |
-
-
-
-
- |
-
- [[ comma_me(solde_debit(data)) ]]
- |
-
- [[ comma_me(solde_credit(data)) ]]
- |
-
-
-
-
- |
-
-
-
-
- |
- Code
+ [[ setTag('tr','tr',{'style':'Line1'}) ]] Code
|
Partner name
|
- Débit
+ Débit
|
- Crédit
+ Crédit
|
- Balance
+ Balance
|
- In dispute
+ In dispute
|
|
- [[ repeatIn(lines(data), 'a') ]][[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['ref'] ]]
+ [[ setTag('tr','tr',{'style':'Line2'}) ]] Grand total
|
- [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['type']==3 and a['code'] ]] [[ a['name'] ]]
+
|
- [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ comma_me(a['debit']) ]]
+ [[ sum_debit(data) or '0.0' ]]
|
- [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ comma_me(a['credit']) ]]
+ [[ sum_credit(data) or '0.0' ]]
|
- [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ comma_me(a['balance']) ]]
+ [[ (sum_scredit(data)-sum_sdebit(data)) or '0.0' ]]
|
- [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ comma_me(a['enlitige']) ]]
+ [[ sum_litige(data) or '0.0' ]]
+ |
+
+
+
+ |
+ [[ repeatIn(lines(data), 'a') ]][[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['ref'] ]] [[ a['type']==3 and a['code'] ]]
+ |
+
+ [[ a['type']==3 and ( setTag('tr','tr',{'style':'TrLevel0'})) ]] [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['type']==1 and ( setTag('blockTable','blockTable',{'style':'LineLevel1'})) ]] [[ a['name'] ]]
+ |
+
+
+ [[ (a['type']==3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]] [[ a['debit'] or '0.0' ]]
+ [[ (a['type']!=3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica'}) ]] [[ a['debit'] or '0.0' ]]
+
+ |
+
+
+ [[ (a['type']==3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]] [[ a['credit'] or '0.0' ]]
+ [[ (a['type']!=3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica'}) ]] [[ a['credit'] or '0.0' ]]
+
+ |
+
+
+ [[ (a['type']==3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]] [[ a['balance'] or '0.0' ]]
+ [[ (a['type']!=3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica'}) ]] [[ a['balance'] or '0.0' ]]
+
+ |
+
+
+ [[ (a['type']==3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]] [[ a['enlitige'] or '0.0' ]]
+ [[ (a['type']!=3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica'}) ]] [[ a['enlitige'] or '0.0' ]]
+
|
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/addons/account/report/tax_report.py b/addons/account/report/tax_report.py
index 445ca968878..6e8cc64f29c 100755
--- a/addons/account/report/tax_report.py
+++ b/addons/account/report/tax_report.py
@@ -87,7 +87,7 @@ class tax_report(rml_parse.rml_parse):
while ind_general < len(res_general) :
res_general[ind_general]['type'] = 2
res_general[ind_general]['pos'] = 0
- res_general[ind_general]['level'] = res_dict['level'] + ' '
+ res_general[ind_general]['level'] = res_dict['level']
top_result.append(res_general[ind_general])
ind_general+=1
i+=1
@@ -143,6 +143,7 @@ class tax_report(rml_parse.rml_parse):
GROUP BY account.id,account.name,account.code', ('draft',tax_code_id,
company_id))
res = self.cr.dictfetchall()
+
#AND line.period_id IN ('+ period_sql_list +') \
i = 0
@@ -158,7 +159,7 @@ class tax_report(rml_parse.rml_parse):
res = []
for code in tc.browse(self.cr, self.uid, ids, {'based_on': based_on}):
res.append(('a'*2*level,code))
- print"=====res=====",res
+
res += self._get_codes(based_on, code.id, level+1)
return res
diff --git a/addons/account/report/tax_report.rml b/addons/account/report/tax_report.rml
index 50dd5a89dda..3b34e3bb618 100755
--- a/addons/account/report/tax_report.rml
+++ b/addons/account/report/tax_report.rml
@@ -128,19 +128,11 @@
-
-
-
-
-
+
-
-
-
-
[[ repeatIn(get_lines(data['form']['based_on'],data['form']['periods'],data['form']['company_id']), 'o') ]]
[[ o['level'] ]]
- [[o['type']==1 and ( setTag('para','para',{'fontName':'Helvetica'}))]]
+ [[o['type']==1 and ( setTag('para','para',{'fontName':'Helvetica'}))]]
[[ setTag('tr','tr',{'style':'TrLevel'+str(o['level']), 'paraStyle':('Level'+str(o['level']))}) ]]
[[ o['code'] ]] [[ o['name'] ]]
|
- [[o['type']==2 and (o['debit']) ]]
+
+
+ [[ len(o['level'])>3 and removeParentNode('font') ]][[ formatLang(o['debit']) and '%.2f'%o['debit'] or '0.00' ]]
+ [[ len(o['level'])<4 and removeParentNode('font') ]][[ formatLang(o['debit']) and '%.2f'%o['debit'] or '0.00' ]]
+
|
- [[o['type']==2 and (o['credit']) ]]
+ [[ len(o['level'])>3 and removeParentNode('font') ]][[ formatLang(o['credit']) and '%.2f'%o['credit'] or '0.00' ]]
+ [[ len(o['level'])<4 and removeParentNode('font') ]][[ formatLang(o['credit']) and '%.2f'%o['credit'] or '0.00' ]]
+
+
|
- [[ o['tax_amount'] ]]
+ [[ len(o['level'])>3 and removeParentNode('font') ]][[ formatLang(o['tax_amount']) and '%.2f'%o['tax_amount'] or '0.00' ]]
+ [[ len(o['level'])<4 and removeParentNode('font') ]][[ formatLang(o['tax_amount']) and '%.2f'%o['tax_amount'] or '0.00' ]]
+
+
|
|
diff --git a/addons/account/report/third_party_ledger.py b/addons/account/report/third_party_ledger.py
index c8bda2a3045..194e18d1d53 100755
--- a/addons/account/report/third_party_ledger.py
+++ b/addons/account/report/third_party_ledger.py
@@ -59,7 +59,7 @@ class third_party_ledger(rml_parse.rml_parse):
for date in date_array:
full_str_date.append(str(date))
return full_str_date
-
+
#
def transform_period_into_date_array(self,data):
## Get All Period Date
@@ -67,18 +67,61 @@ class third_party_ledger(rml_parse.rml_parse):
periods_id = self.pool.get('account.period').search(self.cr, self.uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
else:
periods_id = data['form']['periods'][0][2]
- date_array = []
+ date_array = []
for period_id in periods_id:
period_obj = self.pool.get('account.period').browse(self.cr, self.uid, period_id)
date_array = date_array + self.date_range(period_obj.date_start,period_obj.date_stop)
self.date_lst = date_array
self.date_lst.sort()
-
+
def transform_date_into_date_array(self,data):
return_array = self.date_range(data['form']['date1'],data['form']['date2'])
self.date_lst = return_array
self.date_lst.sort()
+ def transform_both_into_date_array(self,data):
+
+ if not data['form']['periods'][0][2] :
+ periods_id = self.pool.get('account.period').search(self.cr, self.uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
+ else:
+ periods_id = data['form']['periods'][0][2]
+ date_array = []
+ for period_id in periods_id:
+ period_obj = self.pool.get('account.period').browse(self.cr, self.uid, period_id)
+ date_array = date_array + self.date_range(period_obj.date_start,period_obj.date_stop)
+
+ period_start_date = date_array[0]
+ date_start_date = data['form']['date1']
+ period_stop_date = date_array[-1]
+ date_stop_date = data['form']['date2']
+
+ if period_start_date
-
+
@@ -19,24 +19,24 @@
[[ company.name ]]
Third Party Ledger [[ data['form']['result_selection'] == 'customer' and '/ Débiteur' ]] [[ data['form']['result_selection'] == 'supplier' and '/ Créancier' ]] [[ data['form']['result_selection'] == 'all' and '/ Créancier et Débiteur' ]]
-
+
-
-
+
+
[[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]
Page
-
+
1cm 27.7cm 20cm 27.7cm
-
+
-
+
-
+
@@ -53,43 +53,43 @@
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -124,16 +124,16 @@
-
+
[[ data['form']['page_split'] == True or removeParentNode('para') ]]
[[ repeatIn(objects, 'p') ]] [[ setLang(p.partner_id.lang) ]]
-
+
|
-
+
Date
|
@@ -147,7 +147,7 @@
|
Debit
- |
+
Credit
|
@@ -183,7 +183,7 @@
[[ data['form']['page_split'] == False or removeParentNode('para') ]]
[[ repeatIn(objects, 'p') ]]
-
+
|
[[ p.ref ]] - [[ p.name ]]
@@ -202,7 +202,7 @@
|
-
+
|
[[ repeatIn(lines(p,data), 'line') ]][[ line['date'] ]]
@@ -211,10 +211,10 @@
[[ line['code'] ]]
|
- [[ line['ref'] ]]
+ [[ line['ref'] ]] / [[ line['name'] ]]
|
- [[ line['name'] ]]
+
|
[[ (line['debit']) or '' ]]
@@ -227,13 +227,13 @@
|
-
+
-
-
-
-
+
+
+
+
-
+
\ No newline at end of file
diff --git a/addons/account/report/wizard_account_journal.rml b/addons/account/report/wizard_account_journal.rml
new file mode 100644
index 00000000000..def6acbecb8
--- /dev/null
+++ b/addons/account/report/wizard_account_journal.rml
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [[ company.name ]]
+ Print Journal - [[ company.currency_id.name ]]
+
+
+
+
+
+
+ [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]
+ Page
+
+
+
+
+ 1cm 27.7cm 20cm 27.7cm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [[ repeatIn(objects, 'o') ]]
+
+ [[repeatIn(lines(data['form']['period_id'][0][2],data['form']['journal_id'][0][2],data['form']['sort_selection']), 'line') ]]
+
+ |
+ Date
+ |
+
+ Voucher No
+ |
+
+ A/c No.
+ |
+
+ Third party
+ |
+
+ Entry label
+ |
+
+ Debit
+ |
+
+ Credit
+ |
+
+
+ |
+ [[line[0].period_id.name ]]
+ |
+
+ [[line[0].journal_id.code ]] |
+ |
+ |
+ |
+
+ [[ '%.2f' % sum_debit(line[0].period_id.id, line[0].journal_id.id) or '0.00' ]]
+ |
+
+ [[ '%.2f' % sum_credit(line[0].period_id.id, line[0].journal_id.id) or '0.00' ]]
+ |
+
+
+ [[repeatIn(line,'l')]]
+ |
+ [[ l.date ]]
+ |
+
+ [[ l.ref ]]
+ |
+
+ [[ l.account_id.code ]]
+ |
+
+ [[ l.partner_id and l.partner_id.name ]]
+ |
+
+ [[ l.name ]]
+ |
+
+ [[ l.debit and '%.2f' % l.debit or '0.00' ]]
+ |
+
+ [[ l.credit and '%.2f' % l.credit or '0.00' ]]
+ |
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 3860447ff9d..7f441b1b551 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -1,4 +1,4 @@
-
+
Finance / Invoice
@@ -11,4 +11,29 @@
Finance / Manager
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 67bbe0f197e..9dbdcb18b55 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -4,15 +4,18 @@
"access_account_account_type","account.account.type","model_account_account_type","account.group_account_user",1,0,0,0
"access_account_tax","account.tax","model_account_tax","account.group_account_user",1,0,0,0
"access_account_account","account.account","model_account_account","account.group_account_user",1,0,0,0
+"access_account_account_user","account.account user","model_account_account","base.group_user",1,0,0,0
+"access_account_account_partner_manager","account.account partner manager","model_account_account","base.group_partner_manager",1,0,0,0
"access_account_journal_view","account.journal.view","model_account_journal_view","account.group_account_user",1,0,0,0
"access_account_journal_column","account.journal.column","model_account_journal_column","account.group_account_user",1,0,0,0
"access_account_journal","account.journal","model_account_journal","account.group_account_user",1,0,0,0
"access_account_period","account.period","model_account_period","account.group_account_user",1,0,0,0
+"access_account_journal_period_manager","account.journal.period manager","model_account_journal_period","account.group_account_manager",1,1,1,1
"access_account_journal_period","account.journal.period","model_account_journal_period","account.group_account_user",1,1,1,1
"access_account_move","account.move","model_account_move","account.group_account_user",1,1,1,1
"access_account_move_reconcile","account.move.reconcile","model_account_move_reconcile","account.group_account_user",1,1,1,1
-"access_account_tax_code","account.tax.code","model_account_tax_code","account.group_account_user",1,0,0,0
-"access_account_tax","account.tax","model_account_tax","account.group_account_user",1,0,0,0
+"access_account_tax_code","account.tax.code","model_account_tax_code",,1,0,0,0
+"access_account_tax","account.tax","model_account_tax",,1,0,0,0
"access_account_model","account.model","model_account_model","account.group_account_user",1,1,1,1
"access_account_model_line","account.model.line","model_account_model_line","account.group_account_user",1,1,1,1
"access_account_subscription","account.subscription","model_account_subscription","account.group_account_user",1,1,1,1
@@ -24,25 +27,22 @@
"access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,1,1,1
"access_wizard_multi_charts_accounts","wizard.multi.charts.accounts","model_wizard_multi_charts_accounts","account.group_account_manager",1,1,1,1
"access_account_bank_accounts_wizard","account.bank.accounts.wizard","model_account_bank_accounts_wizard","account.group_account_manager",1,1,1,1
-"access_account_move_line","account.move.line","model_account_move_line","account.group_account_user",1,1,1,1
+"access_account_move_line","account.move.line invoice","model_account_move_line","account.group_account_invoice",1,1,1,1
"access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_account_user",1,1,1,1
"access_account_bank_statement_reconcile","account.bank.statement.reconcile","model_account_bank_statement_reconcile","account.group_account_user",1,1,1,1
"access_account_bank_statement_reconcile_line","account.bank.statement.reconcile.line","model_account_bank_statement_reconcile_line","account.group_account_user",1,1,1,1
"access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,1,1,1
"access_account_analytic_line","account.analytic.line","model_account_analytic_line","account.group_account_user",1,1,1,1
"access_report_hr_timesheet_invoice_journal","report.hr.timesheet.invoice.journal","model_report_hr_timesheet_invoice_journal","account.group_account_manager",1,0,0,0
-"access_account_invoice","account.invoice","model_account_invoice","account.group_account_user",1,0,0,0
-"access_account_invoice_line","account.invoice.line","model_account_invoice_line","account.group_account_user",1,0,0,0
-"access_account_invoice_tax","account.invoice.tax","model_account_invoice_tax","account.group_account_user",1,0,0,0
-"access_account_analytic_account","account.analytic.account","model_account_analytic_account","account.group_account_user",1,0,0,0
+"access_account_analytic_account","account.analytic.account","model_account_analytic_account","base.group_user",1,0,0,0
"access_account_analytic_journal","account.analytic.journal","model_account_analytic_journal","account.group_account_user",1,0,0,0
-"access_account_invoice_uinvoice","account.invoice","model_account_invoice","account.group_account_user",1,1,1,1
-"access_account_invoice_line_uinvoice","account.invoice.line","model_account_invoice_line","account.group_account_user",1,1,1,1
-"access_account_invoice_tax_uinvoice","account.invoice.tax","model_account_invoice_tax","account.group_account_user",1,1,1,1
+"access_account_invoice_uinvoice","account.invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
+"access_account_invoice_line_uinvoice","account.invoice.line","model_account_invoice_line","account.group_account_invoice",1,1,1,1
+"access_account_invoice_tax_uinvoice","account.invoice.tax","model_account_invoice_tax","account.group_account_invoice",1,1,1,1
"access_account_analytic_line_uinvoice","account.analytic.line","model_account_analytic_line","account.group_account_user",1,1,1,1
-"access_account_move_uinvoice","account.move","model_account_move","account.group_account_user",1,1,1,1
-"access_account_move_reconcile_uinvoice","account.move.reconcile","model_account_move_reconcile","account.group_account_user",1,1,1,1
-"access_account_journal_period_uinvoice","account.journal.period","model_account_journal_period","account.group_account_user",1,1,1,1
+"access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,1,1,1
+"access_account_move_reconcile_uinvoice","account.move.reconcile","model_account_move_reconcile","account.group_account_invoice",1,1,1,1
+"access_account_journal_period_uinvoice","account.journal.period","model_account_journal_period","account.group_account_invoice",1,1,1,1
"access_account_payment_term_manager","account.payment.term","model_account_payment_term","account.group_account_manager",1,1,1,1
"access_account_payment_term_line_manager","account.payment.term.line","model_account_payment_term_line","account.group_account_manager",1,1,1,1
"access_account_account_type_manager","account.account.type","model_account_account_type","account.group_account_manager",1,1,1,1
@@ -51,14 +51,31 @@
"access_account_journal_view_manager","account.journal.view","model_account_journal_view","account.group_account_manager",1,1,1,1
"access_account_journal_column_manager","account.journal.column","model_account_journal_column","account.group_account_manager",1,1,1,1
"access_account_journal_manager","account.journal","model_account_journal","account.group_account_manager",1,1,1,1
+"access_account_journal_invoice","account.journal invoice","model_account_journal","account.group_account_invoice",1,0,0,0
"access_account_period_manager","account.period","model_account_period","account.group_account_manager",1,1,1,1
+"access_account_period_invoice","account.period invoice","model_account_period","account.group_account_invoice",1,0,0,0
"access_account_tax_code_manager","account.tax.code","model_account_tax_code","account.group_account_manager",1,1,1,1
"access_account_tax_manager","account.tax","model_account_tax","account.group_account_manager",1,1,1,1
-"access_account_invoice_manager","account.invoice","model_account_invoice","account.group_account_manager",1,1,1,1
-"access_account_invoice_line_manager","account.invoice.line","model_account_invoice_line","account.group_account_manager",1,1,1,1
-"access_account_invoice_tax_manager","account.invoice.tax","model_account_invoice_tax","account.group_account_manager",1,1,1,1
+"access_account_invoice_group_invoice","account.invoice group invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
"access_account_analytic_account_manager","account.analytic.account","model_account_analytic_account","account.group_account_manager",1,1,1,1
"access_account_analytic_journal_manager","account.analytic.journal","model_account_analytic_journal","account.group_account_manager",1,1,1,1
"access_account_fiscalyear","account.fiscalyear","model_account_fiscalyear","account.group_account_manager",1,1,1,1
"access_account_fiscalyear_user","account.fiscalyear.user","model_account_fiscalyear","account.group_account_user",1,0,0,0
"access_account_fiscalyear_invoice","account.fiscalyear.invoice","model_account_fiscalyear","account.group_account_invoice",1,0,0,0
+"access_res_currency_account_manager","res.currency account manager","base.model_res_currency","group_account_manager",1,1,1,1
+"access_res_currency_rate_account_manager","res.currency.rate account manager","base.model_res_currency_rate","group_account_manager",1,1,1,1
+"access_account_config_wizard_account_manager","account.config.wizard account manager","model_account_config_wizard","group_account_manager",1,1,1,1
+"access_account_config_wizard_system_manager","account.config.wizard system manager","model_account_config_wizard","base.group_system",1,1,1,1
+"access_account_invoice_partner_manager","account.invoice partner manager","model_account_invoice","base.group_partner_manager",1,0,0,0
+"access_account_invoice_line_partner_manager","account.invoice.line partner manager","model_account_invoice_line","base.group_partner_manager",1,0,0,0
+"access_account_invoice_tax_partner_manager","account.invoice.tax partner manager","model_account_invoice_tax","base.group_partner_manager",1,0,0,0
+"access_account_payment_term_partner_manager","account.payment.term partner manager","model_account_payment_term","base.group_user",1,0,0,0
+"access_account_payment_term_line_partner_manager","account.payment.term.line partner manager","model_account_payment_term_line","base.group_user",1,0,0,0
+"access_account_account_product_manager","account.account product manager","model_account_account","product.group_product_manager",1,0,0,0
+"access_account_journal_product_manager","account.journal product manager","model_account_journal","product.group_product_manager",1,0,0,0
+"access_account_fiscal_position_product_manager","account.fiscal.position account.manager","model_account_fiscal_position","account.group_account_manager",1,1,1,1
+"access_account_fiscal_position","account.fiscal.position all","model_account_fiscal_position","base.group_user",1,0,0,0
+"access_account_fiscal_position_tax_product_manager","account.fiscal.position.tax account.manager","model_account_fiscal_position_tax","account.group_account_manager",1,1,1,1
+"access_account_fiscal_position_tax","account.fiscal.position.tax all","model_account_fiscal_position_tax","base.group_user",1,0,0,0
+"access_account_fiscal_position_account_product_manager","account.fiscal.position account.manager","model_account_fiscal_position_account","account.group_account_manager",1,1,1,1
+"access_account_fiscal_position_account","account.fiscal.position all","model_account_fiscal_position_account","base.group_user",1,0,0,0
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index 6ecd2040756..3cae8e78a95 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -64,6 +64,7 @@ import wizard_use_model
import wizard_state_open
import wizard_statement_from_invoice
+import wizard_print_journal
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/wizard_account_balance_report.py b/addons/account/wizard/wizard_account_balance_report.py
index 431e183f156..3677f51f050 100644
--- a/addons/account/wizard/wizard_account_balance_report.py
+++ b/addons/account/wizard/wizard_account_balance_report.py
@@ -46,7 +46,7 @@ dates_form = '''
dates_fields = {
'date_from': {'string':"Start date",'type':'date','required':True ,'default': lambda *a: time.strftime('%Y-01-01')},
'date_to': {'string':"End date",'type':'date','required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
- 'display_account':{'string':"Display accounts",'type':'selection','selection':[('bal_mouvement','With movements'),('bal_all','All'),('bal_solde','With balance is not equal to 0')]}
+ 'display_account':{'string':"Filter on Accounts",'type':'selection','selection':[('bal_mouvement','With Entries'),('bal_all','All Accounts'),('bal_solde','With Balance Different Than 0')]}
}
@@ -61,8 +61,12 @@ period_form = '''
period_fields = {
- 'fiscalyear': {'string': 'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
- 'help': 'Keep empty for all open fiscal year'},
+ 'fiscalyear': {
+ 'string':'Fiscal year',
+ 'type':'many2one',
+ 'relation':'account.fiscalyear',
+ 'help':'Keep empty for all open fiscal year'
+ },
'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty'},
'display_account':{'string':"Display accounts ",'type':'selection','selection':[('bal_mouvement','With movements'),('bal_all','All'),('bal_solde','With balance is not equal to 0')]}
}
diff --git a/addons/account/wizard/wizard_aged_trial_balance.py b/addons/account/wizard/wizard_aged_trial_balance.py
index ce95c2c8ab1..7e8bcc6048c 100755
--- a/addons/account/wizard/wizard_aged_trial_balance.py
+++ b/addons/account/wizard/wizard_aged_trial_balance.py
@@ -35,76 +35,84 @@ from mx.DateTime import *
_aged_trial_form = """
"""
_aged_trial_fields = {
- 'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
- 'period_length': {'string': 'Period length (days)', 'type': 'integer', 'required': True, 'default': lambda *a:30},
- 'date1': {'string':'Start of period', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
- 'result_selection':{'string':"Display partner",'type':'selection','selection':[('customer','Debiteur'),('supplier','Creancier'),('all','Tous')]},
- 'direction_selection':{'string':"Display aged balance of",'type':'selection','selection':[('past','Due amount'),('future','Not due amount')]},
- }
+ 'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
+ 'period_length': {'string': 'Period length (days)', 'type': 'integer', 'required': True, 'default': lambda *a:30},
+ 'date1': {'string':'Start of period', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
+ 'result_selection':{
+ 'string':"Filter on Partners",
+ 'type':'selection',
+ 'selection':[('customer','Customer'),('supplier','Supplier'),('all','All')],
+ 'required':True,
+ 'default': lambda *a: 'customer',
+ },
+ 'direction_selection':{
+ 'string':"Analysis Direction",
+ 'type':'selection',
+ 'selection':[('past','Past'),('future','Future')],
+ 'required':True,
+ 'default': lambda *a: 'past',
+ },
+}
def _calc_dates(self, cr, uid, data, context):
- res = {}
- period_length = data['form']['period_length']
- if period_length<=0:
- raise wizard.except_wizard('UserError', 'You must enter a period length that cannot be 0 or below !')
- start = datetime.date.fromtimestamp(time.mktime(time.strptime(data['form']['date1'],"%Y-%m-%d")))
- start = DateTime(int(start.year),int(start.month),int(start.day))
- if data['form']['direction_selection'] == 'past':
- for i in range(5)[::-1]:
- stop = start - RelativeDateTime(days=period_length)
- res[str(i)] = {
- 'name' : str((5-(i+1))*period_length) + '-' + str((5-i)*period_length),
-
- 'stop': start.strftime('%Y-%m-%d'),
- 'start' : stop.strftime('%Y-%m-%d'),
- }
- start = stop - RelativeDateTime(days=1)
- else:
- for i in range(5):
- stop = start + RelativeDateTime(days=period_length)
- res[str(5-(i+1))] = {
- 'name' : str((i)*period_length)+'-'+str((i+1)*period_length),
- 'start': start.strftime('%Y-%m-%d'),
- 'stop' : stop.strftime('%Y-%m-%d'),
- }
- start = stop + RelativeDateTime(days=1)
- return res
+ res = {}
+ period_length = data['form']['period_length']
+ if period_length<=0:
+ raise wizard.except_wizard('UserError', 'You must enter a period length that cannot be 0 or below !')
+ start = datetime.date.fromtimestamp(time.mktime(time.strptime(data['form']['date1'],"%Y-%m-%d")))
+ start = DateTime(int(start.year),int(start.month),int(start.day))
+ if data['form']['direction_selection'] == 'past':
+ for i in range(5)[::-1]:
+ stop = start - RelativeDateTime(days=period_length)
+ res[str(i)] = {
+ 'name' : str((5-(i+1))*period_length) + '-' + str((5-i)*period_length),
+
+ 'stop': start.strftime('%Y-%m-%d'),
+ 'start' : stop.strftime('%Y-%m-%d'),
+ }
+ start = stop - RelativeDateTime(days=1)
+ else:
+ for i in range(5):
+ stop = start + RelativeDateTime(days=period_length)
+ res[str(5-(i+1))] = {
+ 'name' : str((i)*period_length)+'-'+str((i+1)*period_length),
+ 'start': start.strftime('%Y-%m-%d'),
+ 'stop' : stop.strftime('%Y-%m-%d'),
+ }
+ start = stop + RelativeDateTime(days=1)
+ return res
class wizard_report(wizard.interface):
- def _get_defaults(self, cr, uid, data, context):
- fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
- data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
-
- user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context)
- if user.company_id:
- company_id = user.company_id.id
- else:
- company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
- data['form']['company_id'] = company_id
-
- return data['form']
-
-
- states = {
- 'init': {
- 'actions': [_get_defaults],
- 'result': {'type':'form', 'arch':_aged_trial_form, 'fields':_aged_trial_fields, 'state':[('end','Cancel'),('print','Print Aged Trial Balance')]},
- },
- 'print': {
- 'actions': [_calc_dates],
- 'result': {'type':'print', 'report':'account.aged_trial_balance', 'state':'end'},
- },
- }
+ def _get_defaults(self, cr, uid, data, context):
+ fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
+ data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
+ user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context)
+ if user.company_id:
+ company_id = user.company_id.id
+ else:
+ company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
+ data['form']['company_id'] = company_id
+ return data['form']
+ states = {
+ 'init': {
+ 'actions': [_get_defaults],
+ 'result': {'type':'form', 'arch':_aged_trial_form, 'fields':_aged_trial_fields, 'state':[('end','Cancel'),('print','Print Aged Trial Balance')]},
+ },
+ 'print': {
+ 'actions': [_calc_dates],
+ 'result': {'type':'print', 'report':'account.aged_trial_balance', 'state':'end'},
+ },
+ }
wizard_report('account.aged.trial.balance')
diff --git a/addons/account/wizard/wizard_partner_balance_report.py b/addons/account/wizard/wizard_partner_balance_report.py
index 08af6074215..5b28e10ceb9 100644
--- a/addons/account/wizard/wizard_partner_balance_report.py
+++ b/addons/account/wizard/wizard_partner_balance_report.py
@@ -29,78 +29,80 @@ import time
import wizard
import pooler
-report_type = '''
-'''
-
-
-dates_form = '''
-'''
-
-dates_fields = {
- 'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
- 'result_selection':{'string':"Display partner ",'type':'selection','selection':[('customer','Debiteur'),('supplier','Creancier'),('all','Tous')]},
- 'soldeinit':{'string':"Inclure les soldes initiaux",'type':'boolean'},
- 'date1': {'string':'Start date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')},
- 'date2': {'string':'End date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
-}
-
period_form = '''
-'''
period_fields = {
'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
- 'fiscalyear': {'string': 'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
- 'help': 'Keep empty for all open fiscal year'},
- 'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty'},
- 'result_selection':{'string':"Display partner",'type':'selection','selection':[('customer','Debiteur'),('supplier','Creancier'),('all','Tous')]},
- 'soldeinit':{'string':"Inclure les soldes initiaux",'type':'boolean'},
+ 'state':{
+ 'string':"Date/Period Filter",
+ 'type':'selection',
+ 'selection':[('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')],
+ 'default': lambda *a:'bydate'
+ },
+ 'fiscalyear': {
+ 'string':'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
+ 'help': 'Keep empty for all open fiscal year'
+ },
+ 'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty','states':{'none':[('readonly',True)],'bydate':[('readonly',True)]}},
+ 'result_selection':{
+ 'string':"Partner",
+ 'type':'selection',
+ 'selection':[('customer','Receivable Accounts'),('supplier','Payable Accounts'),('all','Receivable and Payable Accounts')],
+ 'required':True
+ },
+ 'soldeinit':{'string':" Inclure les soldes initiaux",'type':'boolean'},
+ 'date1': {'string':' Start date', 'type':'date', 'required':True,'default': lambda *a: time.strftime('%Y-01-01')},
+ 'date2': {'string':'End date', 'type':'date', 'required':True,'default': lambda *a: time.strftime('%Y-%m-%d')},
}
-
class wizard_report(wizard.interface):
- def _get_defaults(self, cr, uid, data, context):
+
+ def _get_defaults(self,cr,uid,data,context):
+ user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context)
+ if user.company_id:
+ company_id = user.company_id.id
+ else:
+ company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
+
fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
+ periods_obj=pooler.get_pool(cr.dbname).get('account.period')
data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
-
- user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context)
- if user.company_id:
- company_id = user.company_id.id
- else:
- company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
+ data['form']['periods'] =periods_obj.search(cr, uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
data['form']['company_id'] = company_id
data['form']['soldeinit'] = True
data['form']['result_selection'] = 'all'
return data['form']
- def _get_defaults_fordate(self, cr, uid, data, context):
- user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context)
- if user.company_id:
- company_id = user.company_id.id
- else:
- company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
- data['form']['company_id'] = company_id
- data['form']['soldeinit'] = True
- data['form']['result_selection'] = 'all'
+ def _check_state(self, cr, uid, data, context):
+
+ if data['form']['state'] == 'bydate' :
+ self._check_date(cr, uid, data, context)
return data['form']
-
+
def _check_date(self, cr, uid, data, context):
+
sql = """
SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f Where '%s' between f.date_start and f.date_stop """%(data['form']['date1'])
cr.execute(sql)
@@ -114,27 +116,14 @@ class wizard_report(wizard.interface):
else:
raise wizard.except_wizard('UserError','Date not in a defined fiscal year')
-
states = {
'init': {
- 'actions': [],
- 'result': {'type':'form', 'arch':report_type,'fields':{}, 'state':[('with_period','Use with Period'),('with_date','Use with Date')]}
- },
- 'with_period': {
'actions': [_get_defaults],
- 'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel'),('report','Print')]}
- },
- 'with_date': {
- 'actions': [_get_defaults_fordate],
- 'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('checkdate','Print')]}
- },
- 'checkdate': {
- 'actions': [],
- 'result': {'type':'choice','next_state':_check_date}
+ 'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel'),('report','Print')]}
},
'report': {
- 'actions': [],
+ 'actions': [_check_state],
'result': {'type':'print', 'report':'account.partner.balance', 'state':'end'}
}
}
diff --git a/addons/account/wizard/wizard_print_journal.py b/addons/account/wizard/wizard_print_journal.py
new file mode 100644
index 00000000000..d9440a8a231
--- /dev/null
+++ b/addons/account/wizard/wizard_print_journal.py
@@ -0,0 +1,71 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+import wizard
+import pooler
+
+form = '''
+'''
+
+fields = {
+ 'journal_id': {'string': 'Journal', 'type': 'many2many', 'relation': 'account.journal', 'required': True},
+ 'period_id': {'string': 'Period', 'type': 'many2many', 'relation': 'account.period', 'required': True},
+ 'sort_selection':{
+ 'string':"Entries Sorted By",
+ 'type':'selection',
+ 'selection':[('date','By date'),('ref','Reference Number')],
+ 'required':True,
+ 'default': lambda *a: 'date',
+ },
+
+}
+
+def print_journal(self, cr, uid, data, context):
+ return {}
+
+class wizard_print_journal(wizard.interface):
+ states = {
+ 'init': {
+ 'actions': [],
+ 'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel'), ('print', 'Print'))},
+ },
+ 'print': {
+ 'actions': [print_journal],
+ 'result': {'type':'print', 'report':'account.journal.period.print.wiz', 'state':'end'},
+ },
+ }
+wizard_print_journal('account.print.journal.report')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account/wizard/wizard_third_party_ledger.py b/addons/account/wizard/wizard_third_party_ledger.py
index e9f2daf4b01..298cf910275 100755
--- a/addons/account/wizard/wizard_third_party_ledger.py
+++ b/addons/account/wizard/wizard_third_party_ledger.py
@@ -30,65 +30,65 @@ import wizard
import pooler
-report_type = '''
-'''
-
-
-dates_form = '''
-'''
-
-dates_fields = {
- 'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
- 'date1': {'string':'Start date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')},
- 'date2': {'string':'End date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
- 'result_selection':{'string':"Display partners",'type':'selection','selection':[('customer','Debiteur'),('supplier','Creancier'),('all','Tous')]},
- 'soldeinit':{'string':"Inclure les soldes initiaux",'type':'boolean'},
- 'reconcil':{'string':"Inclure les ecritures reconsiliees",'type':'boolean'},
- 'page_split':{'string':"Un partenaire par page",'type':'boolean'},
-}
-
period_form = '''
'''
period_fields = {
'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
- 'fiscalyear': {'string': 'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
- 'help': 'Keep empty for all open fiscal year'},
- 'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty'},
- 'result_selection':{'string':"Display partners",'type':'selection','selection':[('customer','Debiteur'),('supplier','Creancier'),('all','Tous')]},
+ 'state':{
+ 'string':"Date/Period Filter",
+ 'type':'selection',
+ 'selection':[('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')],
+ 'default': lambda *a:'bydate'
+ },
+ 'fiscalyear': {
+ 'string':'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
+ 'help': 'Keep empty for all open fiscal year'
+ },
+ 'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty','states':{'none':[('readonly',True)],'bydate':[('readonly',True)]}},
+ 'result_selection':{
+ 'string':"Partner",
+ 'type':'selection',
+ 'selection':[('customer','Receivable Accounts'),('supplier','Payable Accounts'),('all','Receivable and Payable Accounts')],
+ 'required':True
+ },
'soldeinit':{'string':"Inclure les soldes initiaux",'type':'boolean'},
- 'reconcil':{'string':"Inclure les ecritures reconsiliees",'type':'boolean'},
- 'page_split':{'string':"Un partenaire par page",'type':'boolean'},
+ 'reconcil':{'string':" Include Reconciled Entries",'type':'boolean'},
+ 'page_split':{'string':"One Partner Per Page",'type':'boolean'},
+ 'date1': {'string':' Start date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')},
+ 'date2': {'string':'End date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
}
class wizard_report(wizard.interface):
def _get_defaults(self, cr, uid, data, context):
-
fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
data['form']['display_account']='bal_all'
@@ -100,26 +100,15 @@ class wizard_report(wizard.interface):
else:
company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
data['form']['company_id'] = company_id
+ periods_obj=pooler.get_pool(cr.dbname).get('account.period')
+ data['form']['periods'] =periods_obj.search(cr, uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
data['form']['page_split'] = False
data['form']['reconcil'] = False
data['form']['soldeinit'] = True
return data['form']
- def _get_defaults_fordate(self, cr, uid, data, context):
- data['form']['result_selection'] = 'all'
- user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context)
- if user.company_id:
- company_id = user.company_id.id
- else:
- company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
- data['form']['company_id'] = company_id
- data['form']['page_split'] = False
- data['form']['reconcil'] = False
- data['form']['soldeinit'] = True
- return data['form']
-
-
def _check_date(self, cr, uid, data, context):
+
sql = """
SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f Where '%s' between f.date_start and f.date_stop """%(data['form']['date1'])
cr.execute(sql)
@@ -132,27 +121,24 @@ class wizard_report(wizard.interface):
else:
raise wizard.except_wizard('UserError','Date not in a defined fiscal year')
+
+
+ def _check_state(self, cr, uid, data, context):
+ if data['form']['state'] == 'byperiod':
+ data['form']['fiscalyear'] = True
+ else :
+ self._check_date(cr, uid, data, context)
+ data['form']['fiscalyear'] = False
+ return data['form']
states = {
'init': {
- 'actions': [],
- 'result': {'type':'form', 'arch':report_type,'fields':{}, 'state':[('with_period','Use with Period'),('with_date','Use with Date')]}
- },
- 'with_period': {
'actions': [_get_defaults],
'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel'),('report','Print')]}
},
- 'with_date': {
- 'actions': [_get_defaults_fordate],
- 'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('checkdate','Print')]}
- },
- 'checkdate': {
- 'actions': [],
- 'result': {'type':'choice','next_state':_check_date}
- },
'report': {
- 'actions': [],
+ 'actions': [_check_state],
'result': {'type':'print', 'report':'account.third_party_ledger', 'state':'end'}
}
}
diff --git a/addons/account_analytic_plans/security/ir.model.access.csv b/addons/account_analytic_plans/security/ir.model.access.csv
index fe56cde8939..f7f141ac15a 100644
--- a/addons/account_analytic_plans/security/ir.model.access.csv
+++ b/addons/account_analytic_plans/security/ir.model.access.csv
@@ -1,7 +1,8 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_account_analytic_plan_line,account.analytic.plan.line,model_account_analytic_plan_line,account.group_account_user,1,1,1,1
-access_account_analytic_plan_instance,account.analytic.plan.instance,model_account_analytic_plan_instance,account.group_account_user,1,1,1,1
-access_account_analytic_plan_instance_line,account.analytic.plan.instance.line,model_account_analytic_plan_instance_line,account.group_account_user,1,1,1,1
-access_account_analytic_plan_line_invoice,account.analytic.plan.line.invoice,model_account_analytic_plan_line,account.group_account_user,1,1,1,1
-access_account_analytic_plan_instance_invoice,account.analytic.plan.instance.invoice,model_account_analytic_plan_instance,account.group_account_user,1,1,1,1
-access_account_analytic_plan_instance_line_invoice,account.analytic.plan.instance.line.invoice,model_account_analytic_plan_instance_line,account.group_account_user,1,1,1,1
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_account_analytic_plan","account.analytic.plan","model_account_analytic_plan","account.group_account_user",1,1,1,1
+"access_account_analytic_plan_line","account.analytic.plan.line","model_account_analytic_plan_line","account.group_account_user",1,1,1,1
+"access_account_analytic_plan_instance","account.analytic.plan.instance","model_account_analytic_plan_instance","account.group_account_user",1,1,1,1
+"access_account_analytic_plan_instance_line","account.analytic.plan.instance.line","model_account_analytic_plan_instance_line","account.group_account_user",1,1,1,1
+"access_account_analytic_plan_line_invoice","account.analytic.plan.line.invoice","model_account_analytic_plan_line","account.group_account_user",1,1,1,1
+"access_account_analytic_plan_instance_manager","account.analytic.plan.instance manager","model_account_analytic_plan_instance","account.group_account_manager",1,1,1,1
+"access_account_analytic_plan_instance_line_manager","account.analytic.plan.instance.line manager","model_account_analytic_plan_instance_line","account.group_account_manager",1,1,1,1
diff --git a/addons/account_budget/i18n/fr_FR.po b/addons/account_budget/i18n/fr_FR.po
index c192840f293..f1c7b9cf177 100644
--- a/addons/account_budget/i18n/fr_FR.po
+++ b/addons/account_budget/i18n/fr_FR.po
@@ -1,346 +1,313 @@
# Translation of OpenERP Server.
# This file containt the translation of the following modules:
-# * account_budget
+# * account_budget_crossover
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:42+0000"
-"PO-Revision-Date: 2008-09-11 15:41:42+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 16:26+0000\n"
+"PO-Revision-Date: 2008-10-14 10:30+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-14 11:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
-#. module: account_budget
-#: view:account.budget.post:0
-msgid "Dotations"
-msgstr "Dotations"
-
-#. module: account_budget
+#. module: account_budget_crossover
#: field:crossovered.budget,creating_user_id:0
msgid "Responsible User"
-msgstr ""
+msgstr "Utilisateur Responsable"
-#. module: account_budget
+#. module: account_budget_crossover
#: selection:crossovered.budget,state:0
msgid "Confirmed"
-msgstr ""
+msgstr "Confirmé"
-#. module: account_budget
+#. module: account_budget_crossover
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
-#. module: account_budget
-#: model:ir.actions.report.xml,name:account_budget.account_analytic_account_budget
-#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
-#: model:ir.actions.wizard,name:account_budget.account_analytic_account_budget_report
-#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu
-msgid "Print Budgets"
-msgstr ""
+#. module: account_budget_crossover
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Printed at:"
+msgstr "Imprimé à :"
-#. module: account_budget
+#. module: account_budget_crossover
#: view:crossovered.budget:0
msgid "Confirm"
-msgstr ""
+msgstr "Confirmer"
-#. module: account_budget
+#. module: account_budget_crossover
#: field:crossovered.budget,validating_user_id:0
msgid "Validate User"
-msgstr ""
+msgstr "Valider l'utilisateur"
-#. module: account_budget
+#. module: account_budget_crossover
#: field:crossovered.budget.lines,analytic_account_id:0
msgid "Analytic Account Ref"
-msgstr ""
+msgstr "Réf. du Compte Analytique"
-#. module: account_budget
-#: view:account.budget.post:0
-msgid "Master Budget"
-msgstr ""
+#. module: account_budget_crossover
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Currency:"
+msgstr "Devise"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Période"
-
-#. module: account_budget
-#: selection:crossovered.budget,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: account_budget
-#: wizard_view:account.budget.spread,init:0
-#: wizard_button:account.budget.spread,init,spread:0
-#: view:account.budget.post:0
-msgid "Spread"
-msgstr "Écarts"
-
-#. module: account_budget
+#. module: account_budget_crossover
#: selection:crossovered.budget,state:0
msgid "Draft"
-msgstr ""
+msgstr "Brouillon"
-#. module: account_budget
-#: model:ir.actions.wizard,name:account_budget.wizard_budget_spread
-msgid "Spread amount"
-msgstr "Ventiler le montant"
+#. module: account_budget_crossover
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "at"
+msgstr "à"
-#. module: account_budget
+#. module: account_budget_crossover
+#: model:ir.actions.report.xml,name:account_budget_crossover.account_analytic_account_budget
+#: model:ir.actions.report.xml,name:account_budget_crossover.report_crossovered_budget
+#: model:ir.actions.wizard,name:account_budget_crossover.account_analytic_account_budget_report
+#: model:ir.actions.wizard,name:account_budget_crossover.wizard_crossovered_budget_menu
+msgid "Print Budgets"
+msgstr "Imprimer les Budgets"
+
+#. module: account_budget_crossover
#: wizard_button:wizard.analytic.account.budget.report,init,report:0
-#: wizard_button:account.budget.report,init,report:0
#: wizard_button:wizard.crossovered.budget,init,report:0
#: wizard_button:wizard.crossovered.budget.summary,init,report:0
msgid "Print"
msgstr "Imprimer"
-#. module: account_budget
+#. module: account_budget_crossover
#: field:crossovered.budget.lines,percentage:0
msgid "Percentage"
+msgstr "Pourcentage"
+
+#. module: account_budget_crossover
+#: selection:crossovered.budget,state:0
+msgid "Validated"
+msgstr "Validé"
+
+#. module: account_budget_crossover
+#: model:ir.model,name:account_budget_crossover.model_crossovered_budget_lines
+msgid "Crossovered Budget Lines"
msgstr ""
-#. module: account_budget
-#: field:crossovered.budget,state:0
-msgid "Status"
-msgstr ""
-
-#. module: account_budget
-#: wizard_field:wizard.analytic.account.budget.report,init,date_from:0
-#: wizard_field:account.budget.report,init,date1:0
-#: wizard_field:wizard.crossovered.budget,init,date_from:0
-#: wizard_field:wizard.crossovered.budget.summary,init,date_from:0
-msgid "Start of period"
-msgstr "Démarrer période"
-
-#. module: account_budget
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget item endowment"
-msgstr "Répartition des postes budgétaires"
-
-#. module: account_budget
-#: field:crossovered.budget.lines,crossovered_budget_id:0
-msgid "Budget Ref"
-msgstr ""
-
-#. module: account_budget
-#: field:crossovered.budget.lines,planned_amount:0
-msgid "Planned Amount"
-msgstr ""
-
-#. module: account_budget
-#: wizard_view:account.budget.report,init:0
-msgid "Select period"
-msgstr "Sélectionner période"
-
-#. module: account_budget
-#: model:ir.ui.menu,name:account_budget.menu_financial_reporting_budget_budget_entries
-msgid "Entries"
-msgstr "Entrées "
-
-#. module: account_budget
-#: field:account.budget.post,account_ids:0
-#: view:account.budget.post:0
-msgid "Accounts"
-msgstr "Comptes"
-
-#. module: account_budget
-#: view:crossovered.budget:0
-msgid "Validate"
-msgstr ""
-
-#. module: account_budget
-#: wizard_view:wizard.crossovered.budget,init:0
-#: wizard_view:wizard.crossovered.budget.summary,init:0
-msgid "Select Options"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.actions.act_window,name:account_budget.open_budget_post_form
-#: model:ir.ui.menu,name:account_budget.menu_budget_post_form
-msgid "Master Budgets"
-msgstr ""
-
-#. module: account_budget
-#: field:crossovered.budget.lines,practical_amount:0
-msgid "Practical Amount"
-msgstr ""
-
-#. module: account_budget
-#: field:crossovered.budget,date_to:0
-#: field:crossovered.budget.lines,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: account_budget
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_budget
-#: field:crossovered.budget.lines,theoritical_amount:0
-msgid "Theoritical Amount"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,name:0
-#: field:account.budget.post,name:0
+#. module: account_budget_crossover
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Nom"
-#. module: account_budget
-#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu_1
-msgid "Print Summary of Budgets"
-msgstr ""
+#. module: account_budget_crossover
+#: field:crossovered.budget,state:0
+msgid "Status"
+msgstr "État"
-#. module: account_budget
-#: selection:crossovered.budget,state:0
+#. module: account_budget_crossover
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "%"
+msgstr "%"
+
+#. module: account_budget_crossover
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Description"
+msgstr "Description"
+
+#. module: account_budget_crossover
+#: rml:account.analytic.account.budget:0
+msgid "Analytic Account :"
+msgstr "Compte Analytique :"
+
+#. module: account_budget_crossover
+#: field:crossovered.budget.lines,crossovered_budget_id:0
+msgid "Budget Ref"
+msgstr "Réf. du Budget"
+
+#. module: account_budget_crossover
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "to"
+msgstr "au"
+
+#. module: account_budget_crossover
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+#: field:crossovered.budget.lines,planned_amount:0
+msgid "Planned Amount"
+msgstr "Montant Plannifié"
+
+#. module: account_budget_crossover
+#: model:ir.ui.menu,name:account_budget_crossover.menu_financial_reporting_budget_budget_entries
+msgid "Entries"
+msgstr "Écritures"
+
+#. module: account_budget_crossover
#: view:crossovered.budget:0
-msgid "Done"
-msgstr ""
+msgid "Validate"
+msgstr "Valider"
-#. module: account_budget
+#. module: account_budget_crossover
+#: wizard_view:wizard.crossovered.budget,init:0
+#: wizard_view:wizard.crossovered.budget.summary,init:0
+msgid "Select Options"
+msgstr "Sélectionnez les Options"
+
+#. module: account_budget_crossover
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+#: field:crossovered.budget.lines,practical_amount:0
+msgid "Practical Amount"
+msgstr "Montant en Pratique"
+
+#. module: account_budget_crossover
+#: field:crossovered.budget,date_to:0
+#: field:crossovered.budget.lines,date_to:0
+msgid "End Date"
+msgstr "Date de fin"
+
+#. module: account_budget_crossover
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valide pour l'architecture de la vue"
+
+#. module: account_budget_crossover
+#: field:crossovered.budget.lines,theoritical_amount:0
+msgid "Theoritical Amount"
+msgstr "Montant Théorique"
+
+#. module: account_budget_crossover
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Total:"
+msgstr "Total:"
+
+#. module: account_budget_crossover
+#: selection:crossovered.budget,state:0
+msgid "Cancelled"
+msgstr "Annulé"
+
+#. module: account_budget_crossover
#: field:crossovered.budget.lines,general_budget_id:0
msgid "Master Budget Ref"
-msgstr ""
+msgstr "Réf; du Budget Principal"
-#. module: account_budget
+#. module: account_budget_crossover
#: view:account.analytic.account:0
-#: view:account.budget.post:0
msgid "Lines"
msgstr "Lignes"
-#. module: account_budget
-#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
-#: model:ir.actions.wizard,name:account_budget.wizard_budget_report
-#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
+#. module: account_budget_crossover
+#: model:ir.actions.act_window,name:account_budget_crossover.act_crossovered_budget_view
+#: model:ir.ui.menu,name:account_budget_crossover.menu_act_crossovered_budget_view
#: view:crossovered.budget:0
msgid "Budget"
-msgstr "Prévisions budgétaires"
+msgstr "Budget"
-#. module: account_budget
-#: view:account.budget.post:0
-msgid "Definition"
-msgstr "Définition de campagne"
-
-#. module: account_budget
+#. module: account_budget_crossover
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
-msgstr ""
+msgstr "Sélectionnez la Période de Date"
-#. module: account_budget
-#: wizard_field:account.budget.spread,init,fiscalyear:0
-msgid "Fiscal Year"
-msgstr "Exercice comptable"
-
-#. module: account_budget
+#. module: account_budget_crossover
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
-msgstr ""
+msgstr "Date de Paiement"
-#. module: account_budget
-#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
-#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
-#: model:ir.ui.menu,name:account_budget.menu_financial_reporting_budget_budget
-#: model:ir.ui.menu,name:account_budget.next_id_31
+#. module: account_budget_crossover
+#: model:ir.ui.menu,name:account_budget_crossover.menu_financial_reporting_budget_budget
msgid "Budgets"
msgstr "Budgets"
-#. module: account_budget
-#: model:ir.model,name:account_budget.model_account_budget_post
-msgid "Budget item"
-msgstr "Poste budgétaire"
-
-#. module: account_budget
+#. module: account_budget_crossover
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
-#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.crossovered.budget,init,date_to:0
#: wizard_field:wizard.crossovered.budget.summary,init,date_to:0
msgid "End of period"
msgstr "Fin de la période"
-#. module: account_budget
-#: model:ir.model,name:account_budget.model_crossovered_budget
+#. module: account_budget_crossover
+#: model:ir.model,name:account_budget_crossover.model_crossovered_budget
msgid "Crossovered Budget"
msgstr ""
-#. module: account_budget
-#: model:ir.model,name:account_budget.model_crossovered_budget_lines
-msgid "Crossovered Budget Lines"
-msgstr ""
+#. module: account_budget_crossover
+#: wizard_field:wizard.analytic.account.budget.report,init,date_from:0
+#: wizard_field:wizard.crossovered.budget,init,date_from:0
+#: wizard_field:wizard.crossovered.budget.summary,init,date_from:0
+msgid "Start of period"
+msgstr "Début de la période"
-#. module: account_budget
-#: field:account.budget.post,code:0
+#. module: account_budget_crossover
+#: model:ir.actions.wizard,name:account_budget_crossover.wizard_crossovered_budget_menu_1
+msgid "Print Summary of Budgets"
+msgstr "Imprimer le Résumé des Budgets"
+
+#. module: account_budget_crossover
#: field:crossovered.budget,code:0
msgid "Code"
msgstr "Code"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Master Budget Expenses"
-msgstr ""
+#. module: account_budget_crossover
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Theoretical Amount"
+msgstr "Montant Théorique"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Élément"
+#. module: account_budget_crossover
+#: rml:crossovered.budget.report:0
+msgid "Budget :"
+msgstr "Budget :"
-#. module: account_budget
-#: wizard_field:account.budget.spread,init,amount:0
-#: field:account.budget.post.dotation,amount:0
-msgid "Amount"
-msgstr "Montant"
+#. module: account_budget_crossover
+#: selection:crossovered.budget,state:0
+#: view:crossovered.budget:0
+msgid "Done"
+msgstr "Terminé"
-#. module: account_budget
-#: field:account.budget.post,dotation_ids:0
-msgid "Expenses"
-msgstr "Dépense"
-
-#. module: account_budget
-#: model:ir.actions.report.xml,name:account_budget.account_budget
-msgid "Print Budget"
-msgstr "Impression du budget"
-
-#. module: account_budget
-#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
+#. module: account_budget_crossover
+#: model:ir.actions.act_window,name:account_budget_crossover.act_crossovered_budget_lines_view
#: field:account.analytic.account,crossovered_budget_line:0
#: field:account.budget.post,crossovered_budget_line:0
#: field:crossovered.budget,crossovered_budget_line:0
-#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
+#: model:ir.ui.menu,name:account_budget_crossover.menu_act_crossovered_budget_lines_view
#: view:crossovered.budget:0
#: view:account.analytic.account:0
-#: view:account.budget.post:0
#: view:crossovered.budget.lines:0
msgid "Budget Lines"
-msgstr ""
+msgstr "Lignes de Budget"
-#. module: account_budget
+#. module: account_budget_crossover
#: wizard_button:wizard.analytic.account.budget.report,init,end:0
-#: wizard_button:account.budget.report,init,end:0
-#: wizard_button:account.budget.spread,init,end:0
#: wizard_button:wizard.crossovered.budget,init,end:0
#: wizard_button:wizard.crossovered.budget.summary,init,end:0
#: view:crossovered.budget:0
msgid "Cancel"
msgstr "Annuler"
-#. module: account_budget
+#. module: account_budget_crossover
#: field:account.budget.post.dotation,tot_planned:0
msgid "Total Planned Amount"
-msgstr ""
+msgstr "Montant Total Planifié"
-#. module: account_budget
+#. module: account_budget_crossover
#: field:crossovered.budget,date_from:0
#: field:crossovered.budget.lines,date_from:0
msgid "Start Date"
-msgstr ""
-
-#. module: account_budget
-#: selection:crossovered.budget,state:0
-msgid "Validated"
-msgstr ""
+msgstr "Date de début"
+#. module: account_budget_crossover
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Analysis from"
+msgstr "Analyse de"
diff --git a/addons/account_followup/__terp__.py b/addons/account_followup/__terp__.py
index a1b6713ca83..392df34f11a 100644
--- a/addons/account_followup/__terp__.py
+++ b/addons/account_followup/__terp__.py
@@ -50,8 +50,9 @@
"demo_xml" : ["followup_demo.xml"],
"update_xml" : [
"security/ir.model.access.csv",
+ "wizard/wizard_view.xml",
"followup_view.xml",
- "followup_report_view.xml"
+ "followup_report_view.xml",
],
"active": False,
"installable": True
diff --git a/addons/account_followup/followup_view.xml b/addons/account_followup/followup_view.xml
index 8739a94372a..81298dbf24d 100644
--- a/addons/account_followup/followup_view.xml
+++ b/addons/account_followup/followup_view.xml
@@ -42,12 +42,6 @@
-
- Send followups
- account_followup.followup.print.all
-
-
-
account.move.line.partner.tree
diff --git a/addons/account_followup/i18n/fr_FR.po b/addons/account_followup/i18n/fr_FR.po
index a7794a7331f..c049727c42f 100644
--- a/addons/account_followup/i18n/fr_FR.po
+++ b/addons/account_followup/i18n/fr_FR.po
@@ -427,7 +427,7 @@ msgstr "%(partner_name)s: nom du Partenaire"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "Select partners to remind"
-msgstr ""
+msgstr "Sélectionnez les partenaires à prévenir"
#. module: account_followup
#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
diff --git a/addons/account_followup/wizard/wizard_view.xml b/addons/account_followup/wizard/wizard_view.xml
new file mode 100644
index 00000000000..643265ddca2
--- /dev/null
+++ b/addons/account_followup/wizard/wizard_view.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
diff --git a/addons/account_payment/security/ir.model.access.csv b/addons/account_payment/security/ir.model.access.csv
index d5d97f5cbdc..09ee2170239 100644
--- a/addons/account_payment/security/ir.model.access.csv
+++ b/addons/account_payment/security/ir.model.access.csv
@@ -1,5 +1,8 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_payment_type,payment.type,model_payment_type,group_account_payment,1,1,1,1
-access_payment_mode,payment.mode,model_payment_mode,group_account_payment,1,1,1,1
-access_payment_order,payment.order,model_payment_order,group_account_payment,1,1,1,1
-access_payment_line,payment.line,model_payment_line,group_account_payment,1,1,1,1
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_payment_type","payment.type","model_payment_type","group_account_payment",1,1,1,1
+"access_payment_mode","payment.mode","model_payment_mode","group_account_payment",1,1,1,1
+"access_payment_order","payment.order","model_payment_order","group_account_payment",1,1,1,1
+"access_payment_line","payment.line","model_payment_line","group_account_payment",1,1,1,1
+"access_account_journal_payement","account.journal payment","account.model_account_journal","group_account_payment",1,0,0,0
+"access_account_invoice_payment","account.invoice payment","account.model_account_invoice","group_account_payment",1,0,0,0
+"access_account_move_line_payment","account.move.line payment","account.model_account_move_line","group_account_payment",1,0,0,0
diff --git a/addons/account_report/account_report.xml b/addons/account_report/account_report.xml
index 082c15f139f..b105fae4cf4 100755
--- a/addons/account_report/account_report.xml
+++ b/addons/account_report/account_report.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/addons/account_report/report/__init__.py b/addons/account_report/report/__init__.py
index 3592ada3b0a..03cbac9c6d7 100644
--- a/addons/account_report/report/__init__.py
+++ b/addons/account_report/report/__init__.py
@@ -29,6 +29,7 @@
##############################################################################
import accounting_report
+import print_indicator
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_report/report/print_indicator.py b/addons/account_report/report/print_indicator.py
new file mode 100644
index 00000000000..203f249178b
--- /dev/null
+++ b/addons/account_report/report/print_indicator.py
@@ -0,0 +1,265 @@
+
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+import pooler
+import time
+from report import report_sxw
+
+#from report.interface import report_int
+#from reportlab.graphics.shapes import Drawing
+#from reportlab.graphics.charts.barcharts import VerticalBarChart
+#import reportlab.lib.colors as colors
+#from reportlab.graphics.widgetbase import Widget, TypedPropertyCollection
+#from reportlab.graphics.charts.textlabels import BarChartLabel
+#from reportlab.graphics import renderPM
+#from report.render import render
+#from report.interface import report_int
+from pychart import *
+import StringIO
+theme.use_color = 1
+theme.default_font_family = "Helvetica-Bold"
+theme.default_font_size = 18
+theme.default_line_width = 1.0
+import tools
+
+
+parents = {
+ 'tr':1,
+ 'li':1,
+ 'story': 0,
+ 'section': 0
+}
+
+class accounting_report_indicator(report_sxw.rml_parse):
+
+ def __init__(self, cr, uid, name, context):
+ super(accounting_report_indicator, self).__init__(cr, uid, name, context)
+ self.ret_list = []
+ self.localcontext.update({
+ 'time': time,
+ 'test': self.test1,
+ 'lines':self.lines,
+ 'getarray':self.getarray,
+ })
+ self.count=0
+ self.list=[]
+ self.header_name=self.header_val=[]
+
+ def repeatIn(self, lst, name, nodes_parent=False,td=False,width=[],value=[],type=[]):
+ self._node.data = ''
+ node = self._find_parent(self._node, nodes_parent or parents)
+ ns = node.nextSibling
+#start
+ if not name=='array':
+ return super(accounting_report_indicator,self).repeatIn(lst, name, nodes_parent=False)
+
+ value=['Data']
+ value.extend(self.header_name)
+ type=['string'].extend(['float']*len(self.header_name))
+ width=[40]*(len(self.header_name)+1)
+
+ if not lst:
+ lst.append(1)
+ for ns in node.childNodes :
+ if ns and ns.nodeName!='#text' and ns.tagName=='blockTable' and td :
+ width_str = ns._attrs['colWidths'].nodeValue
+ ns.removeAttribute('colWidths')
+ total_td = td * len(value)
+
+ if not width:
+ for v in value:
+ width.append(30)
+ for v in range(len(value)):
+ width_str +=',%d'%width[v]
+
+ ns.setAttribute('colWidths',width_str)
+
+ child_list = ns.childNodes
+ check=0
+ for child in child_list:
+ if child.nodeName=='tr':
+ lc = child.childNodes[1]
+# for t in range(td):
+ i=0
+ for v in value:
+ newnode = lc.cloneNode(1)
+ if check==1:
+ t1="[[ %s['%s'] ]]"%(name,v)
+ else:
+ t1="%s"%(v)
+ newnode.childNodes[1].lastChild.data = t1
+ child.appendChild(newnode)
+ newnode=False
+ i+=1
+ check=1
+
+ return super(accounting_report_indicator,self).repeatIn(lst, name, nodes_parent=False)
+
+ def lines(self,data):
+ res={}
+ result=[]
+ ind_ids=self.pool.get('account.report.report').search(self.cr,self.uid,[])
+ obj_inds=self.pool.get('account.report.report').browse(self.cr,self.uid,ind_ids)
+
+# def find_child(obj):
+# self.list.append(obj)
+# if obj.child_ids:
+# for child in obj.child_ids:
+# find_child(child)
+# return True
+#
+# find_child(obj_inds)
+
+ for obj_ind in obj_inds:
+ res = {
+ 'id':obj_ind.id,
+ 'name':obj_ind.name,
+ 'code':obj_ind.code,
+ 'expression':obj_ind.expression,
+ 'disp_graph':obj_ind.disp_graph,
+ 'note':obj_ind.note,
+ 'type':obj_ind.type,
+ }
+ result.append(res)
+ return result
+
+ def getarray(self,data,object):
+ res={}
+ result=[]
+ self.test1(data,object,intercall=True)
+ self.header_val=[str(x) for x in self.header_val]
+ temp_dict=zip(self.header_name,self.header_val)
+ res=dict(temp_dict)
+ res['Data']='Value'
+ result.append(res)
+ return result
+
+
+ def test1(self,data,object,intercall=False):
+ obj_history=self.pool.get('account.report.history')
+
+ if data['select_base']=='year':
+ tuple_search=('fiscalyear_id','in',data['base_selection'][0][2])
+ base='year'
+ else:
+ tuple_search=('period_id','in',data['base_selection'][0][2])
+ base='period'
+
+ history_ids=obj_history.search(self.cr,self.uid,[('name','=',object['id']),tuple_search])
+ history_ids.sort()
+ obj_his=obj_history.browse(self.cr,self.uid,history_ids)
+
+ data_val=[]
+ data_period=[]
+ if base=='period':
+ for item in obj_his:
+ data_val.append(item.val)
+ data_period.append(item.period_id.name)
+ else:
+ for i in data['base_selection'][0][2]:
+ val_temp=[]
+ data_period.append(self.pool.get('account.fiscalyear').browse(self.cr,self.uid,i).name)
+ for item in obj_his:
+ if item.fiscalyear_id.id==i:
+ val_temp.append(item.val)
+ data_val.append(sum(val_temp))
+
+ self.header_name=data_period
+ self.header_val=data_val
+
+ if intercall:
+ return True
+ self.count +=1
+# drawing = Drawing(400, 300)
+# data = [
+# tuple(data_val),
+# ]
+# value_min=0.0
+# vmin=min(data_val)
+# vmax=max(data_val)
+#
+# val_min=((vmin < 0.00 and vmin-2.00) or 0.00)
+# # calculating maximum
+# val_max=(vmax/(pow(10,len(str(int(vmax)))-2))+1)*pow(10,len(str(int(vmax)))-2)
+# bc = VerticalBarChart()
+# bc.x = 50
+# bc.y = 50
+# bc.height = 245
+# bc.width = 300
+# bc.data = data
+# value_step=(abs(val_max)-abs(val_min))/5
+#
+# bc.strokeColor = colors.black
+# bc.valueAxis.valueMin = val_min
+# bc.valueAxis.valueMax = val_max
+# bc.valueAxis.valueStep = value_step
+#
+# bc.categoryAxis.labels.boxAnchor = 'ne'
+# bc.categoryAxis.labels.dx = 8
+#
+# bc.categoryAxis.labels.dy = -2
+# bc.categoryAxis.labels.angle = 30
+# bc.categoryAxis.categoryNames = data_period
+# drawing.add(bc)
+# drawing.save(formats=['png'],fnRoot=path+str(self.count),title="helo")
+# renderPM.drawToFile(drawing1, 'example1.jpg','jpg')
+ import os
+ path=tools.config['addons_path']+"/account_report/tmp_images/image"
+
+ dirname =tools.config['addons_path']+'/account_report/tmp_images/'
+ if not os.path.isdir(dirname):
+ os.mkdir(dirname)
+
+ can = canvas.init('image'+str(self.count)+".png")
+# can.clip(0,0,600,400)
+
+ data=zip(self.header_name,self.header_val)
+
+ ar = area.T(size = (650,450),x_coord = category_coord.T(data, 0), y_range = (None, None),
+ x_axis = axis.X(label="Period // Year",format="/a-30{}%s"),
+ y_axis = axis.Y(label="Value"))
+
+ ar.add_plot(bar_plot.T(data = data,width=15, data_label_format="/o/15{}%s",label = "Value",fill_style=fill_style.red))
+ ar.draw()
+
+ can.close()
+ os.system('cp '+'image'+str(self.count)+'.png ' +path+str(self.count)+'.png')
+ os.system('rm '+'image'+str(self.count)+'.png')
+# can.endclip()
+ return path+str(self.count)+'.png'
+
+report_sxw.report_sxw('report.print.indicators', 'account.report.history',
+ 'addons/account_report/report/print_indicator.rml',
+ parser=accounting_report_indicator, header=False)
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_report/report/print_indicator.rml b/addons/account_report/report/print_indicator.rml
new file mode 100644
index 00000000000..7e66c37452c
--- /dev/null
+++ b/addons/account_report/report/print_indicator.rml
@@ -0,0 +1,178 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+|
+
+
+
+ |
+
+Indicators
+ |
+
+
+
+
+ |
+
+
+|
+[[ company.name ]]
+ |
+
+
+
+
+ |
+
+Currency: [[ company.currency_id.name]]
+
+ |
+
+
+
+
+
+Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]
+
+
+|
+Name
+ |
+
+Code
+ |
+
+
+
+
+
+
+
+[[ repeatIn(lines(data['form']),'o')]]
+
+
+|
+() [[ o['type']=='view' and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]][[ o['name'] ]]
+ |
+
+[[ o['type']=='view' and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]][[ o['code'] ]]
+ |
+
+
+
+
+
+[[ o['disp_graph'] and setTag('para','image',{'width':'450.00','height':'215.00','file':test(data['form'],o)}) or removeParentNode('para') ]]
+
+
+
+
+ [[ repeatIn(getarray(data['form'],o),'array',td=len(data['form']['base_selection'][0][2])) ]]
+
+
+ |
+
+ |
+
+
+ |
+
+ |
+
+
+
+
+
+
+
+
+|
+Expression : [[ o['expression'] ]]
+ |
+
+
+
+
+
+
+
+|
+Notes : [[ o['note'] ]]
+ |
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/account_report/security/ir.model.access.csv b/addons/account_report/security/ir.model.access.csv
index e74efd16f3b..ace4bc06db0 100644
--- a/addons/account_report/security/ir.model.access.csv
+++ b/addons/account_report/security/ir.model.access.csv
@@ -1,2 +1,3 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_account_report_report,account.report.report,model_account_report_report,base.group_user,1,0,0,0
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_account_report_report","account.report.report","model_account_report_report","account.group_account_manager",1,0,0,0
+"access_account_report_history","account.report.history","model_account_report_history","account.group_account_manager",1,0,0,0
diff --git a/addons/account_report/wizard/wizard_print_indicators.py b/addons/account_report/wizard/wizard_print_indicators.py
index 373b86fd914..b781073ddf4 100644
--- a/addons/account_report/wizard/wizard_print_indicators.py
+++ b/addons/account_report/wizard/wizard_print_indicators.py
@@ -33,12 +33,12 @@ import pooler
form = '''
'''
fields = {
- 'indicator_id': {'string':'Choose Indicator', 'type':'many2one', 'relation': 'account.report.report','required':True,},
'select_base': {'string':'Choose Criteria', 'type':'selection','selection':[('year','Based On Fiscal Years'),('periods','Based on Fiscal Periods')],'required':True,},
}
@@ -73,7 +73,7 @@ class wizard_print_indicators(wizard.interface):
},
'print': {
'actions':[],
- 'result' :{'type':'print','report':'report.print.indicators', 'state':'end'}
+ 'result' :{'type':'print','report':'print.indicators', 'state':'end'}
}
}
wizard_print_indicators('print.indicators')
diff --git a/addons/account_tax_include/i18n/fr_FR.po b/addons/account_tax_include/i18n/fr_FR.po
index 3dcb5980d8b..003361b5d18 100644
--- a/addons/account_tax_include/i18n/fr_FR.po
+++ b/addons/account_tax_include/i18n/fr_FR.po
@@ -4,39 +4,39 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:42+0000"
-"PO-Revision-Date: 2008-09-11 15:41:42+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 16:27+0000\n"
+"PO-Revision-Date: 2008-10-09 20:00+0000\n"
+"Last-Translator: Fabien Pinckaers \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-14 14:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue!"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
-msgstr ""
+msgstr "Tax exclue"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
-msgstr ""
+msgstr "Code de calcul pour les taxes comprises"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
-msgstr ""
+msgstr "Tax inclue"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
-msgstr ""
-
+msgstr "Méthode de prix"
diff --git a/addons/analytic_journal_billing_rate/__terp__.py b/addons/analytic_journal_billing_rate/__terp__.py
index 5ee1e35b8a8..b7293fd4c77 100644
--- a/addons/analytic_journal_billing_rate/__terp__.py
+++ b/addons/analytic_journal_billing_rate/__terp__.py
@@ -17,6 +17,7 @@
"demo_xml" : [],
"update_xml" : [
"analytic_journal_billing_rate_view.xml",
+ "security/ir.model.access.csv",
],
"active": False,
"installable": True
diff --git a/addons/analytic_journal_billing_rate/security/ir.model.access.csv b/addons/analytic_journal_billing_rate/security/ir.model.access.csv
new file mode 100644
index 00000000000..cf13af205ba
--- /dev/null
+++ b/addons/analytic_journal_billing_rate/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_analytic_journal_rate_user","analytic journal rate user","model_analytic_journal_rate_grid","project.group_project_user",1,0,0,0
+"access_analytic_journal_rate_manager","analytic journal rate manager","model_analytic_journal_rate_grid","project.group_project_manager",1,1,1,1
+"access_analytic_journal_rate_account_manager","analytic journal rateaccount manager","model_analytic_journal_rate_grid","account.group_account_manager",1,1,1,1
diff --git a/addons/analytic_user_function/__terp__.py b/addons/analytic_user_function/__terp__.py
index 6208cd43226..1a71adee8d6 100644
--- a/addons/analytic_user_function/__terp__.py
+++ b/addons/analytic_user_function/__terp__.py
@@ -17,6 +17,7 @@
"demo_xml" : [],
"update_xml" : [
"analytic_user_function_view.xml",
+ "security/ir.model.access.csv",
],
"active": False,
"installable": True
diff --git a/addons/analytic_user_function/security/ir.model.access.csv b/addons/analytic_user_function/security/ir.model.access.csv
new file mode 100644
index 00000000000..b2fb45404e8
--- /dev/null
+++ b/addons/analytic_user_function/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_analytic_user_funct_user","analytic user funct user","model_analytic_user_funct_grid","project.group_project_user",1,0,0,0
+"access_analytic_user_funct_manager","analytic user funct manager","model_analytic_user_funct_grid","project.group_project_manager",1,1,1,1
+"access_analytic_user_funct_account_manager","analytic user funct account manager","model_analytic_user_funct_grid","account.group_account_manager",1,1,1,1
diff --git a/addons/association_vertical/aso_vertical_view.xml b/addons/association_vertical/aso_vertical_view.xml
index cb810f113d1..219cea03776 100644
--- a/addons/association_vertical/aso_vertical_view.xml
+++ b/addons/association_vertical/aso_vertical_view.xml
@@ -6,15 +6,15 @@
-
+
+
+ id="menu_document_directories"
+ parent="menu_document_configuration"/>
ir.actions.act_window
@@ -80,9 +82,10 @@
[('ressource_parent_type_id','=',False),('parent_id','=',False)]
+ id="menu_document_directories_tree"
+ parent="menu_document"/>
@@ -141,9 +144,10 @@
form
+ id="menu_document_files"
+ parent="menu_document"/>
ir.actions.act_window
@@ -201,21 +205,31 @@
Auto Configure Directory
- auto.configuration
+ document.configuration.wizard
form
@@ -223,7 +237,7 @@
Auto Configure Directory
ir.actions.act_window
- auto.configuration
+ document.configuration.wizard
form
form
new
@@ -232,6 +246,7 @@
Auto Configure Directory
+ This wizard will be configure directory for ressource model.
open
diff --git a/addons/document/process/document_process.xml b/addons/document/process/document_process.xml
new file mode 100644
index 00000000000..3c37c793ab4
--- /dev/null
+++ b/addons/document/process/document_process.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
new file mode 100644
index 00000000000..4cef19d31ed
--- /dev/null
+++ b/addons/document/security/document_security.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+ Document / Manager
+
+
+
+
+
+
diff --git a/addons/document/security/ir.model.access.csv b/addons/document/security/ir.model.access.csv
new file mode 100644
index 00000000000..dfe882e49d8
--- /dev/null
+++ b/addons/document/security/ir.model.access.csv
@@ -0,0 +1,9 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_document_directory_all","document.directory all","model_document_directory",,1,0,0,0
+"access_document_directory_group_document_manager","document.directory document manager","model_document_directory","group_document_manager",1,1,1,1
+"access_document_directory_group_system","document.directory group system","model_document_directory","base.group_system",1,1,1,1
+"access_document_directory_content_all","document.directory.content all","model_document_directory_content",,1,0,0,0
+"access_document_directory_content_group_document_manager","document.directory.content document manager","model_document_directory_content","group_document_manager",1,1,1,1
+"access_document_directory_content_group_system","document.directory.content group system","model_document_directory_content","base.group_system",1,1,1,1
+"access_document_configuation_wizard","document.configuration.wizard document manager","model_document_configuration_wizard","group_document_manager",1,1,1,1
+"access_document_configuation_wizard_sytem","document.configuration.wizard group system","model_document_configuration_wizard","base.group_system",1,1,1,1
diff --git a/addons/event/i18n/fr_FR.po b/addons/event/i18n/fr_FR.po
index e4f3d91286c..7e17a0929c6 100644
--- a/addons/event/i18n/fr_FR.po
+++ b/addons/event/i18n/fr_FR.po
@@ -4,113 +4,114 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:42+0000"
-"PO-Revision-Date: 2008-09-11 15:41:42+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 13:31+0000\n"
+"PO-Revision-Date: 2008-10-13 11:02+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-13 11:24+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: event
#: field:event.event,date_end:0
#: field:report.event.registration,date_end:0
msgid "Ending date"
-msgstr ""
+msgstr "Date de Fin"
#. module: event
#: field:event.event,register_min:0
msgid "Minimum Registrations"
-msgstr ""
+msgstr "Inscriptions Minimum"
#. module: event
#: model:ir.model,name:event.model_event_registration
msgid "Event Registration"
-msgstr ""
+msgstr "Inscription de l'Évenement"
#. module: event
#: model:ir.actions.wizard,name:event.event_reg_invoice
msgid "Make Invoice"
-msgstr ""
+msgstr "Créer facture"
#. module: event
#: field:report.event.type.registration,draft_state:0
msgid "Draft Registrations"
-msgstr ""
+msgstr "Inscriptions Brouillon"
#. module: event
#: view:report.event.registration:0
msgid "Event on Registration"
-msgstr ""
+msgstr "Évènement à l'Inscription"
#. module: event
#: wizard_button:event.reg_make_invoice,init,end:0
#: wizard_button:event.project,init,done:0
msgid "Ok"
-msgstr ""
+msgstr "Ok"
#. module: event
#: field:event.registration,partner_invoice_id:0
msgid "Partner Invoice"
-msgstr ""
+msgstr "Facture Partenaire"
#. module: event
#: model:ir.actions.act_window,name:event.action_registration
#: model:ir.actions.wizard,name:event.wizard_event_registration
#: view:event.event:0
msgid "Registrations"
-msgstr ""
+msgstr "Inscriptions"
#. module: event
#: wizard_field:event.project,init,project_id:0
#: model:ir.actions.wizard,name:event.event_wiz
#: field:event.event,project_id:0
msgid "Project"
-msgstr ""
+msgstr "Projet"
#. module: event
#: wizard_field:event.reg_make_invoice,init,inv_rejected:0
msgid "Invoice Rejected"
-msgstr ""
+msgstr "Facture Rejetée"
#. module: event
#: view:event.event:0
msgid "Confirm Event"
-msgstr ""
+msgstr "Confirmez l'Évènement"
#. module: event
#: field:report.event.registration,draft_state:0
msgid "Draft Registration"
-msgstr ""
+msgstr "Inscription Brouillon"
#. module: event
#: field:event.registration,tobe_invoiced:0
msgid "To be Invoice"
-msgstr ""
+msgstr "à Facturer"
#. module: event
#: wizard_view:event.reg_make_invoice,init:0
msgid "Create Invoices"
-msgstr ""
+msgstr "Créer les Factures"
#. module: event
#: view:event.registration:0
msgid "Extra Info"
-msgstr ""
+msgstr "Infos Complémentaires"
#. module: event
#: view:event.registration:0
msgid "Registration"
-msgstr ""
+msgstr "Inscription"
#. module: event
#: model:ir.model,name:event.model_event_type
#: field:event.type,name:0
msgid "Event type"
-msgstr ""
+msgstr "Type d'Évènement"
#. module: event
#: wizard_view:event.project,init:0
@@ -118,29 +119,29 @@ msgstr ""
#: field:report.event.registration,name:0
#: view:event.event:0
msgid "Event"
-msgstr ""
+msgstr "Évènement"
#. module: event
#: wizard_field:event.reg_make_invoice,init,inv_created:0
msgid "Invoice Created"
-msgstr ""
+msgstr "Facture créée"
#. module: event
#: view:event.event:0
msgid "Statistics"
-msgstr ""
+msgstr "Statistiques"
#. module: event
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue!"
#. module: event
#: model:ir.actions.act_window,name:event.action_registration_confirm
#: field:event.event,register_current:0
#: model:ir.ui.menu,name:event.menu_action_registration_confirm
msgid "Confirmed Registrations"
-msgstr ""
+msgstr "Inscriptions Confirmées"
#. module: event
#: field:event.event,mail_auto_registr:0
@@ -150,12 +151,12 @@ msgstr ""
#. module: event
#: field:event.event,type:0
msgid "Type"
-msgstr ""
+msgstr "Type"
#. module: event
#: field:event.event,section_id:0
msgid "Case section"
-msgstr ""
+msgstr "Section de cas"
#. module: event
#: field:event.event,mail_confirm:0
@@ -165,7 +166,7 @@ msgstr ""
#. module: event
#: model:ir.ui.menu,name:event.menu_event_event
msgid "All Events"
-msgstr ""
+msgstr "Tous les évènements"
#. module: event
#: model:ir.ui.menu,name:event.menu_report_event
@@ -175,34 +176,34 @@ msgstr "Reporting"
#. module: event
#: view:event.event:0
msgid "Remaining Tasks"
-msgstr ""
+msgstr "Tâches Restantes"
#. module: event
#: view:event.registration:0
msgid "Cancel Registration"
-msgstr ""
+msgstr "Annuler l'Inscription"
#. module: event
#: model:ir.ui.menu,name:event.menu_action_event_categories
msgid "Events by Categories"
-msgstr ""
+msgstr "Évènements par Catégorie"
#. module: event
#: field:report.event.type.registration,confirm_state:0
msgid "Confirm Registrations"
-msgstr ""
+msgstr "Confirmez les Inscriptions"
#. module: event
#: view:event.registration:0
msgid "References"
-msgstr ""
+msgstr "Références"
#. module: event
#: model:ir.actions.act_window,name:event.action_event_type_registration
#: model:ir.ui.menu,name:event.menu_report_event_type_registration
#: view:report.event.type.registration:0
msgid "Registration By Event Types"
-msgstr ""
+msgstr "Inscriptions par Types d'Évènements"
#. module: event
#: model:ir.ui.menu,name:event.menu_event_config
@@ -212,37 +213,39 @@ msgstr "Configuration"
#. module: event
#: view:event.registration:0
msgid "Dates"
-msgstr ""
+msgstr "Dates"
#. module: event
#: constraint:product.template:0
msgid "Error: UOS must be in a different category than the UOM"
msgstr ""
+"Erreur: l'unité de vente doit appartenir à une catégorie différente que "
+"l'unité de mesure"
#. module: event
#: view:event.registration:0
msgid "Registration Invoiced"
-msgstr ""
+msgstr "Inscriptions Facturées"
#. module: event
#: field:event.event,budget_id:0
msgid "Budget"
-msgstr ""
+msgstr "Budget"
#. module: event
#: field:report.event.type.registration,nbevent:0
msgid "Number Of Events"
-msgstr ""
+msgstr "Nombre d'Évènements"
#. module: event
#: view:event.event:0
msgid "Cancel Event"
-msgstr ""
+msgstr "Annuler l'Évènement"
#. module: event
#: wizard_field:event.reg_make_invoice,init,inv_rej_reason:0
msgid "Error Messages"
-msgstr ""
+msgstr "Messages d'erreur"
#. module: event
#: view:event.event:0
@@ -252,100 +255,103 @@ msgstr ""
#. module: event
#: model:product.template,name:event.event_product_0_product_template
msgid "Ticket for Concert"
-msgstr ""
+msgstr "Ticket de Concert"
#. module: event
#: model:ir.actions.act_window,name:event.action_registration_draft
#: field:event.event,register_prospect:0
#: model:ir.ui.menu,name:event.menu_action_registration_draft
msgid "Unconfirmed Registrations"
-msgstr ""
+msgstr "Inscriptions Non Confirmées"
#. module: event
#: model:ir.actions.wizard,name:event.wizard_event_task
msgid "Tasks"
-msgstr ""
+msgstr "Tâches"
#. module: event
#: view:event.registration:0
msgid "Communication history"
-msgstr ""
+msgstr "Historique de la communication"
#. module: event
#: help:event.event,mail_auto_registr:0
msgid "A mail is send when the registration is confirmed"
-msgstr ""
+msgstr "Un Message est envoyé lorsque l'inscription est confirmée"
#. module: event
#: help:event.event,mail_auto_confirm:0
msgid "A mail is send when the event is confimed"
-msgstr ""
+msgstr "Un Message est envoyé lorsque l'évènement est confirmé"
#. module: event
#: selection:event.event,state:0
msgid "Canceled"
-msgstr ""
+msgstr "Annulé"
#. module: event
#: view:event.event:0
msgid "Event Done"
-msgstr ""
+msgstr "Évènement Effectué"
#. module: event
#: field:event.registration,badge_name:0
msgid "Badge Name"
-msgstr ""
+msgstr "Nom du Badge"
#. module: event
#: model:ir.actions.act_window,name:event.action_event_registration
#: model:ir.ui.menu,name:event.menu_report_event_registration
msgid "Events On Registrations"
-msgstr ""
+msgstr "Évènements à l'Inscription"
#. module: event
#: view:event.event:0
msgid "Tasks management"
-msgstr ""
+msgstr "Gestion des Tâches"
#. module: event
#: view:event.event:0
msgid "Category"
-msgstr ""
+msgstr "Catégorie"
#. module: event
#: constraint:product.template:0
-msgid "Error: The default UOM and the purchase UOM must be in the same category."
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
msgstr ""
+"Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent "
+"faire partie de la même catégorie"
#. module: event
#: selection:event.event,state:0
msgid "Confirmed"
-msgstr ""
+msgstr "Confirmé"
#. module: event
#: view:event.registration:0
msgid "Action Information"
-msgstr ""
+msgstr "Infos sur l'action"
#. module: event
#: selection:event.event,state:0
msgid "Draft"
-msgstr ""
+msgstr "Brouillon"
#. module: event
#: view:event.event:0
msgid "Event description"
-msgstr ""
+msgstr "Description de l'Évènement"
#. module: event
#: model:ir.model,name:event.model_report_event_type_registration
msgid "Event type on registration"
-msgstr ""
+msgstr "Type d'Évènement à l'Inscription"
#. module: event
#: field:event.registration,badge_title:0
msgid "Badge Title"
-msgstr ""
+msgstr "Titre du Badge"
#. module: event
#: field:event.registration,event_id:0
@@ -356,33 +362,33 @@ msgstr ""
#: model:ir.actions.act_window,name:event.action_event_view
#: view:event.event:0
msgid "Events"
-msgstr ""
+msgstr "Évènements"
#. module: event
#: field:event.registration,nb_register:0
msgid "Number of Registration"
-msgstr ""
+msgstr "Nombre d'Inscription"
#. module: event
#: field:event.event,state:0
#: view:event.event:0
msgid "Status"
-msgstr ""
+msgstr "État"
#. module: event
#: model:ir.actions.act_window,name:event.action_event_categories
msgid "Events by section"
-msgstr ""
+msgstr "Évènements par section"
#. module: event
#: model:ir.ui.menu,name:event.menu_action_registration
msgid "All Registrations"
-msgstr ""
+msgstr "Toutes les Inscriptions"
#. module: event
#: field:event.registration,partner_order_id:0
msgid "Partner Order"
-msgstr ""
+msgstr "Ordre du Partenaire"
#. module: event
#: field:event.event,mail_registr:0
@@ -392,95 +398,98 @@ msgstr ""
#. module: event
#: view:event.event:0
msgid "Set To Draft"
-msgstr ""
+msgstr "Mettre à l'état Brouillon"
#. module: event
#: field:report.event.registration,confirm_state:0
#: view:event.registration:0
msgid "Confirm Registration"
-msgstr ""
+msgstr "Confirmer l'Inscription"
#. module: event
#: view:event.registration:0
msgid "History"
-msgstr ""
+msgstr "Historique"
#. module: event
#: model:ir.ui.menu,name:event.menu_event_type
msgid "Types of Events"
-msgstr ""
+msgstr "Types d'Évènements"
#. module: event
#: view:event.registration:0
msgid "General"
-msgstr ""
+msgstr "Général"
#. module: event
#: view:event.registration:0
msgid "Send Reminder"
-msgstr ""
+msgstr "Envoyer un rappel"
#. module: event
#: selection:event.event,state:0
msgid "Done"
-msgstr ""
+msgstr "Terminé"
#. module: event
#: field:event.event,date_begin:0
#: field:report.event.registration,date_begin:0
msgid "Beginning date"
-msgstr ""
+msgstr "Date de début"
#. module: event
#: field:event.registration,invoice_id:0
msgid "Invoice"
-msgstr ""
+msgstr "Facture"
#. module: event
#: model:ir.model,name:event.model_report_event_registration
msgid "Events on registrations"
-msgstr ""
+msgstr "Évènements à l'Inscription"
#. module: event
#: wizard_button:event.project,init,end:0
msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
#. module: event
#: wizard_button:event.reg_make_invoice,init,open:0
msgid "Open"
-msgstr ""
+msgstr "Ouvert"
#. module: event
#: view:event.event:0
msgid "Information"
-msgstr ""
+msgstr "Information"
#. module: event
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: event
#: model:ir.actions.act_window,name:event.action_new_event_form
#: model:ir.ui.menu,name:event.menu_event_new_event
msgid "New event"
-msgstr ""
+msgstr "Nouvel évènement"
#. module: event
#: view:event.event:0
msgid "All tasks"
-msgstr ""
+msgstr "Toutes les tâches"
#. module: event
#: field:event.registration,unit_price:0
msgid "Unit Price"
-msgstr ""
+msgstr "Prix unitaire"
#. module: event
#: view:event.event:0
msgid "Create Retro-Planning"
-msgstr ""
+msgstr "Générer le retro planning"
#. module: event
#: field:event.registration,badge_partner:0
@@ -491,43 +500,43 @@ msgstr ""
#: model:ir.actions.act_window,name:event.action_event_view_confirm
#: model:ir.ui.menu,name:event.menu_event_event_confirm
msgid "Confirmed Events"
-msgstr ""
+msgstr "Évènements Confirmés"
#. module: event
#: field:event.event,register_max:0
#: field:report.event.registration,register_max:0
msgid "Maximum Registrations"
-msgstr ""
+msgstr "Inscriptions Maximum"
#. module: event
#: view:event.registration:0
msgid "Badge"
-msgstr ""
+msgstr "Badge"
#. module: event
#: model:product.template,name:event.event_product_2_product_template
msgid "Ticket for Conference"
-msgstr ""
+msgstr "Ticket de Conférence"
#. module: event
#: field:event.event,task_ids:0
msgid "Project tasks"
-msgstr ""
+msgstr "Tâches du projet"
#. module: event
#: field:event.registration,case_id:0
msgid "Case"
-msgstr ""
+msgstr "Cas"
#. module: event
#: view:event.event:0
msgid "Name"
-msgstr ""
+msgstr "Nom"
#. module: event
#: field:event.event,product_id:0
msgid "Product"
-msgstr ""
+msgstr "Produit"
#. module: event
#: field:event.registration,invoice_label:0
@@ -537,13 +546,13 @@ msgstr ""
#. module: event
#: view:event.registration:0
msgid "Payments"
-msgstr ""
+msgstr "Paiements"
#. module: event
#: field:report.event.type.registration,name:0
#: view:event.type:0
msgid "Event Type"
-msgstr ""
+msgstr "Type d'évènement"
#. module: event
#: field:event.event,mail_auto_confirm:0
@@ -554,36 +563,35 @@ msgstr ""
#: model:ir.actions.act_window,name:event.action_event_view_draft
#: model:ir.ui.menu,name:event.menu_event_event_draft
msgid "Draft Events"
-msgstr ""
+msgstr "Évènements Brouillon"
#. module: event
#: model:product.template,name:event.event_product_1_product_template
msgid "Ticket for Opera"
-msgstr ""
+msgstr "Ticket d'Opera"
#. module: event
#: model:ir.ui.menu,name:event.menu_event_main
msgid "Events Organisation"
-msgstr ""
+msgstr "Organisation des Évènements"
#. module: event
#: view:event.registration:0
msgid "Actions"
-msgstr ""
+msgstr "Actions"
#. module: event
#: model:ir.actions.wizard,name:event.wizard_event_reg_partners
msgid "List Register Partners"
-msgstr ""
+msgstr "Lister les Partenaires Inscrits"
#. module: event
#: constraint:product.product:0
msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Erreur: code EAN invalide"
#. module: event
#: help:event.event,mail_confirm:0
#: help:event.event,mail_registr:0
msgid "Template for the mail"
-msgstr ""
-
+msgstr "Patron pour le Message"
diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index e7668f30c38..126c78ea6ad 100644
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -1,6 +1,7 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_event_type,event.type,model_event_type,crm.group_crm_user,1,1,1,1
-access_event_event,event.event,model_event_event,crm.group_crm_user,1,1,1,1
-access_event_registration,event.registration,model_event_registration,crm.group_crm_user,1,1,1,1
-access_report_event_registration,report.event.registration,model_report_event_registration,crm.group_crm_user,1,1,1,1
-access_report_event_type_registration,report.event.type.registration,model_report_event_type_registration,crm.group_crm_user,1,1,1,1
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_event_type","event.type","model_event_type","crm.group_crm_user",1,1,1,1
+"access_event_event","event.event","model_event_event","crm.group_crm_user",1,1,1,1
+"access_event_registration","event.registration","model_event_registration","crm.group_crm_user",1,1,1,1
+"access_report_event_registration","report.event.registration","model_report_event_registration","crm.group_crm_user",1,0,0,0
+"access_report_event_type_registration","report.event.type.registration","model_report_event_type_registration","crm.group_crm_user",1,0,0,0
+"access_project_project_crm_user","project.project crm user","project.model_project_project","crm.group_crm_user",1,0,0,0
diff --git a/addons/google_map/i18n/fr_FR.po b/addons/google_map/i18n/fr_FR.po
index 69cca2d908f..7ead04c08b0 100644
--- a/addons/google_map/i18n/fr_FR.po
+++ b/addons/google_map/i18n/fr_FR.po
@@ -4,31 +4,31 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 13:23+0000\n"
+"PO-Revision-Date: 2008-10-11 07:06+0000\n"
+"Last-Translator: Christophe Chauvet \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-14 15:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: google_map
#: view:res.partner.address:0
#: view:res.partner:0
msgid "Map"
-msgstr ""
+msgstr "Carte"
#. module: google_map
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue!"
#. module: google_map
#: view:res.partner.address:0
#: view:res.partner:0
msgid "Street2 : "
-msgstr ""
-
+msgstr "Adresse suite "
diff --git a/addons/hr/__terp__.py b/addons/hr/__terp__.py
index 7da1af96772..1e5c9ff7e12 100644
--- a/addons/hr/__terp__.py
+++ b/addons/hr/__terp__.py
@@ -40,7 +40,7 @@
Different reports are also provided, mainly for attendance statistics.
""",
- "depends" : ["base", "process"],
+ "depends" : ["base", "crm_configuration", "process"],
"init_xml" : [],
"demo_xml" : [
"hr_demo.xml",
@@ -52,6 +52,7 @@
"hr_view.xml",
"hr_wizard.xml",
"hr_department_view.xml",
+ "process/hr_process.xml"
],
"active": False,
"installable": True
diff --git a/addons/hr/i18n/fr_FR.po b/addons/hr/i18n/fr_FR.po
index af72274ae8f..0e17e256282 100644
--- a/addons/hr/i18n/fr_FR.po
+++ b/addons/hr/i18n/fr_FR.po
@@ -4,27 +4,28 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 16:32+0000\n"
+"PO-Revision-Date: 2008-10-13 11:08+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-13 11:28+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: hr
#: model:ir.actions.act_window,name:hr.edit_workgroup
#: model:ir.ui.menu,name:hr.menu_edit_workgroup
msgid "Working Time Categories"
-msgstr ""
+msgstr "Catégories de Temps de Travail"
#. module: hr
#: constraint:hr.department:0
msgid "Error! You can not create recursive departments."
-msgstr ""
+msgstr "Erreur! Vous ne pouvez pas créer de départements récursifs."
#. module: hr
#: field:hr.employee,sinid:0
@@ -54,21 +55,16 @@ msgstr "Imprimer Timesheet"
msgid "Department"
msgstr "département"
-#. module: hr
-#: model:ir.actions.act_window,name:hr.action2
-msgid "Hierarchical view of this employee"
-msgstr "Vue hiérarchisée de cet employé"
-
#. module: hr
#: field:hr.employee,work_email:0
msgid "Work Email"
-msgstr ""
+msgstr "Adresse électronique professionnelle"
#. module: hr
#: model:ir.actions.act_window,name:hr.open_view_employee_list_my
#: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
msgid "My Employees"
-msgstr ""
+msgstr "Mes Employés"
#. module: hr
#: field:hr.timesheet.group,name:0
@@ -96,12 +92,6 @@ msgstr "Total de la période:"
msgid "Reason"
msgstr "Motifs de pointage"
-#. module: hr
-#, python-format
-#: code:addons/hr/wizard/sign_in_out.py:0
-msgid "The sign-out date must be in the past"
-msgstr ""
-
#. module: hr
#: rml:hr.timesheet.attendance.error:0
msgid "Date Signed"
@@ -151,26 +141,18 @@ msgstr "Présent depuis"
#. module: hr
#: wizard_view:hr.si_so,so_ask_si:0
-msgid "You did not signed in the last time. Please enter the date and time you signed in."
-msgstr "Vous n'avez pas pointé la dernière fois. Veuillez entrer la date et l'heure à laquelle vous êtes arrivé(e)"
+msgid ""
+"You did not signed in the last time. Please enter the date and time you "
+"signed in."
+msgstr ""
+"Vous n'avez pas pointé la dernière fois. Veuillez entrer la date et l'heure "
+"à laquelle vous êtes arrivé(e)"
#. module: hr
#: model:ir.actions.act_window,name:hr.open_view_attendance_reason
#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason
msgid "Attendance Reasons"
-msgstr ""
-
-#. module: hr
-#, python-format
-#: code:addons/hr/hr.py:0
-msgid "You tried to sign with a date anterior to another event !\nTry to contact the administrator to correct attendances."
-msgstr ""
-
-#. module: hr
-#, python-format
-#: code:addons/hr/wizard/sign_in_out.py:0
-msgid "UserError"
-msgstr ""
+msgstr "Raisons d'assistance"
#. module: hr
#: model:ir.ui.menu,name:hr.menu_hr_configuration
@@ -193,16 +175,10 @@ msgstr "Pointage employé"
msgid "Sunday"
msgstr "Dimanche"
-#. module: hr
-#, python-format
-#: code:addons/hr/hr.py:0
-msgid "Warning"
-msgstr ""
-
#. module: hr
#: selection:hr.employee,gender:0
msgid "Female"
-msgstr ""
+msgstr "Féminin"
#. module: hr
#: rml:hr.timesheet.attendance.error:0
@@ -210,15 +186,9 @@ msgid "Operation"
msgstr "Opération"
#. module: hr
-#: view:hr.timesheet.group:0
-msgid "Working Time Category"
-msgstr ""
-
-#. module: hr
-#, python-format
-#: code:addons/hr/wizard/sign_in_out.py:0
-msgid "A sign-in must be right after a sign-out !"
-msgstr ""
+#: rml:hr.timesheet.attendance.error:0
+msgid "Date Printed:"
+msgstr "Date Imprimée :"
#. module: hr
#: model:ir.actions.act_window,name:hr.open_view_employee_tree
@@ -249,7 +219,7 @@ msgstr "Sociétés"
#. module: hr
#: field:hr.employee,work_phone:0
msgid "Work Phone"
-msgstr ""
+msgstr "Téléphone professionnel"
#. module: hr
#: wizard_field:hr.timesheet.attendance.report,init,max_delay:0
@@ -259,7 +229,7 @@ msgstr "Délais max (Min)"
#. module: hr
#: field:hr.employee,work_location:0
msgid "Office Location"
-msgstr ""
+msgstr "Localisation du Bureau"
#. module: hr
#: model:ir.model,name:hr.model_hr_employee
@@ -300,10 +270,19 @@ msgstr "Membres"
msgid "Action's type"
msgstr "Type d'action"
+#. module: hr
+#: rml:hr.timesheet.attendance.error:0
+msgid "Report"
+msgstr "Rapport"
+
#. module: hr
#: wizard_view:hr.si_so,si_ask_so:0
-msgid "You did not signed out the last time. Please enter the date and time you signed out."
-msgstr "Vous n'avez pas pointé la dernière fois. Veuillez entrer la date et l'heure à laquelle vous êtes parti(e)"
+msgid ""
+"You did not signed out the last time. Please enter the date and time you "
+"signed out."
+msgstr ""
+"Vous n'avez pas pointé la dernière fois. Veuillez entrer la date et l'heure "
+"à laquelle vous êtes parti(e)"
#. module: hr
#: model:ir.actions.report.xml,name:hr.attendance_error_report
@@ -319,17 +298,12 @@ msgstr "Date de début"
#. module: hr
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue!"
#. module: hr
#: selection:hr.employee,marital:0
msgid "Divorced"
-msgstr ""
-
-#. module: hr
-#: rml:hr.timesheet.attendance.error:0
-msgid "Min Delay"
-msgstr ""
+msgstr "Divorcé(e)"
#. module: hr
#: view:hr.attendance:0
@@ -353,7 +327,7 @@ msgstr "Pointer l'entrée"
#. module: hr
#: selection:hr.employee,marital:0
msgid "Maried"
-msgstr ""
+msgstr "Marié(e)"
#. module: hr
#: field:hr.timesheet,tgroup_id:0
@@ -363,18 +337,13 @@ msgstr "Groupe de feuille de présence"
#. module: hr
#: selection:hr.employee,gender:0
msgid "Male"
-msgstr ""
+msgstr "Masculin"
#. module: hr
-#, python-format
-#: code:addons/hr/wizard/sign_in_out.py:0
-msgid "The Sign-in date must be in the past"
-msgstr ""
-
-#. module: hr
-#: selection:hr.employee,marital:0
-msgid "Unmaried"
-msgstr ""
+#: model:ir.actions.act_window,name:hr.open_view_categ_form
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
+msgid "Categories of Employee"
+msgstr "Catégories d'Employés"
#. module: hr
#: model:ir.model,name:hr.model_hr_employee_category
@@ -404,8 +373,11 @@ msgstr ""
#. module: hr
#: rml:hr.timesheet.attendance.error:0
-msgid "(*) A negative delay means that the employee worked more than encoded."
-msgstr "(*) Un retard négatif signifie que l'employé à travaillé plus que ce qui est encodé."
+msgid ""
+"(*) A negative delay means that the employee worked more than encoded."
+msgstr ""
+"(*) Un retard négatif signifie que l'employé à travaillé plus que ce qui est "
+"encodé."
#. module: hr
#: field:hr.employee,category_id:0
@@ -427,12 +399,6 @@ msgstr "Pointer"
msgid "Note"
msgstr "Note"
-#. module: hr
-#, python-format
-#: code:addons/hr/hr.py:0
-msgid "You tried to sign in with a date anterior to another event !\nTry to contact the administrator to correct attendances."
-msgstr ""
-
#. module: hr
#: model:ir.model,name:hr.model_hr_attendance
#: field:hr.employee,state:0
@@ -442,23 +408,33 @@ msgstr "Pointage"
#. module: hr
#: view:hr.employee:0
msgid "Contact Information"
-msgstr ""
+msgstr "Informations sur le contact"
#. module: hr
#: model:ir.actions.wizard,name:hr.print_week
msgid "Print Timesheet by week"
msgstr "Présences par semaine"
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Other"
+msgstr "Autre"
+
#. module: hr
#: view:hr.employee:0
msgid "Status"
-msgstr ""
+msgstr "État"
#. module: hr
#: field:hr.employee,address_id:0
msgid "Contact address"
msgstr "Adresse"
+#. module: hr
+#: rml:hr.timesheet.attendance.error:0
+msgid "Avg Delay"
+msgstr "Délai Moyen"
+
#. module: hr
#: selection:hr.timesheet,dayofweek:0
msgid "Monday"
@@ -473,13 +449,7 @@ msgstr "Structure des catégories"
#. module: hr
#: view:hr.employee:0
msgid "Job Information"
-msgstr ""
-
-#. module: hr
-#, python-format
-#: code:addons/hr/wizard/sign_in_out.py:0
-msgid "A sign-out must be right after a sign-in !"
-msgstr ""
+msgstr "Information sur l'Emploi"
#. module: hr
#: field:hr.timesheet,dayofweek:0
@@ -496,6 +466,11 @@ msgstr ""
msgid "Date"
msgstr "Date"
+#. module: hr
+#: rml:hr.timesheet.attendance.error:0
+msgid "To:"
+msgstr "À :"
+
#. module: hr
#: wizard_button:hr.si_so,si_ask_so,si:0
#: wizard_button:hr.si_so,init,si_test:0
@@ -519,10 +494,9 @@ msgid "Active"
msgstr "Actif"
#. module: hr
-#: model:ir.actions.act_window,name:hr.open_view_categ_form
-#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
-msgid "Categories of Employee"
-msgstr ""
+#: selection:hr.employee,marital:0
+msgid "Unmaried"
+msgstr "Non Marié(e)"
#. module: hr
#: rml:hr.timesheet.attendance.error:0
@@ -540,12 +514,6 @@ msgstr "Pointage"
msgid "Starting date"
msgstr "Date début"
-#. module: hr
-#, python-format
-#: code:addons/hr/hr.py:0
-msgid "You tried to sign out with a date anterior to another event !\nTry to contact the administrator to correct attendances."
-msgstr ""
-
#. module: hr
#: wizard_view:hr.print_week,init:0
msgid "Select a starting and a end date"
@@ -559,12 +527,12 @@ msgstr "Catégorie parents"
#. module: hr
#: field:hr.employee,marital:0
msgid "Marital Status"
-msgstr ""
+msgstr "État matrimonial"
#. module: hr
-#: selection:hr.employee,marital:0
-msgid "Other"
-msgstr ""
+#: model:ir.actions.act_window,name:hr.action2
+msgid "Hierarchical view of this employee"
+msgstr "Vue hiérarchisée de cet employé"
#. module: hr
#: wizard_button:hr.print_month,init,end:0
@@ -584,24 +552,30 @@ msgstr "Ligne de feuille d'heures"
#. module: hr
#: view:hr.employee:0
msgid "Personal Information"
-msgstr ""
+msgstr "Informations personnelles"
#. module: hr
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: hr
#: rml:hr.timesheet.attendance.error:0
-msgid "(*) A positive delay means that the employee worked less than recorded."
-msgstr "(*) Un retard positif signifie que les employés ont travaillé moins que ce qui est enregistré."
+msgid ""
+"(*) A positive delay means that the employee worked less than recorded."
+msgstr ""
+"(*) Un retard positif signifie que les employés ont travaillé moins que ce "
+"qui est enregistré."
#. module: hr
#: model:ir.model,name:hr.model_hr_timesheet_group
#: field:hr.timesheet.group,timesheet_id:0
#: view:hr.timesheet:0
msgid "Working Time"
-msgstr ""
+msgstr "Temps de Travail"
#. module: hr
#: selection:hr.timesheet,dayofweek:0
@@ -681,18 +655,28 @@ msgstr "département"
#. module: hr
#: field:hr.employee,country_id:0
msgid "Nationality"
-msgstr ""
+msgstr "Nationalité"
#. module: hr
#: view:hr.action.reason:0
msgid "Define attendance reason"
msgstr "Définir les motifs de pointage"
+#. module: hr
+#: rml:hr.timesheet.attendance.error:0
+msgid "From:"
+msgstr "De :"
+
#. module: hr
#: field:hr.employee,otherid:0
msgid "Other ID"
msgstr ""
+#. module: hr
+#: view:hr.timesheet.group:0
+msgid "Working Time Category"
+msgstr "Catégorie de Temps de Travail"
+
#. module: hr
#: field:hr.timesheet,name:0
msgid "Name"
@@ -701,14 +685,14 @@ msgstr "Nom"
#. module: hr
#: field:hr.employee,gender:0
msgid "Gender"
-msgstr ""
+msgstr "Genre"
#. module: hr
#: model:ir.actions.act_window,name:hr.open_view_employee_list
#: model:ir.ui.menu,name:hr.menu_open_view_employee_list
#: view:hr.employee:0
msgid "Employees"
-msgstr ""
+msgstr "Employés"
#. module: hr
#: field:hr.department,name:0
@@ -724,7 +708,7 @@ msgstr "Explication de la tâche"
#. module: hr
#: field:hr.employee,birthday:0
msgid "Started on"
-msgstr ""
+msgstr "Débuté en"
#. module: hr
#: wizard_view:hr.timesheet.attendance.report,init:0
@@ -756,5 +740,4 @@ msgstr "Samedi"
#: model:ir.actions.act_window,name:hr.open_view_employee_new
#: model:ir.ui.menu,name:hr.menu_open_view_employee_new
msgid "New Employee"
-msgstr ""
-
+msgstr "Nouvel employé"
diff --git a/addons/hr/process/hr_process.xml b/addons/hr/process/hr_process.xml
new file mode 100644
index 00000000000..bfb0ad21f2a
--- /dev/null
+++ b/addons/hr/process/hr_process.xml
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index 743cbce21c2..d6e8f812590 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -1,9 +1,10 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_hr_timesheet_group,hr.timesheet.group,model_hr_timesheet_group,hr.group_hr_user,1,0,0,0
-access_hr_employee_category,hr.employee.category,model_hr_employee_category,hr.group_hr_user,1,0,0,0
-access_hr_employee,hr.employee,model_hr_employee,hr.group_hr_user,1,1,1,1
-access_hr_timesheet,hr.timesheet,model_hr_timesheet,hr.group_hr_user,1,1,1,1
-access_hr_department,hr.department,model_hr_department,hr.group_hr_user,1,0,0,0
-access_hr_timesheet_group_manager,hr.timesheet.group.manager,model_hr_timesheet_group,hr.group_hr_manager,1,1,1,1
-access_hr_employee_category_manager,hr.employee.category.manager,model_hr_employee_category,hr.group_hr_manager,1,1,1,1
-access_hr_department_manager,hr.department.manager,model_hr_department,hr.group_hr_manager,1,1,1,1
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_hr_timesheet_group","hr.timesheet.group","model_hr_timesheet_group","hr.group_hr_user",1,0,0,0
+"access_hr_employee_category","hr.employee.category","model_hr_employee_category","hr.group_hr_user",1,0,0,0
+"access_hr_employee","hr.employee","model_hr_employee","hr.group_hr_user",1,1,1,1
+"access_hr_timesheet_manager","hr.timesheet manager","model_hr_timesheet","hr.group_hr_manager",1,1,1,1
+"access_hr_timesheet","hr.timesheet","model_hr_timesheet","hr.group_hr_user",1,1,1,1
+"access_hr_department","hr.department","model_hr_department","hr.group_hr_user",1,0,0,0
+"access_hr_timesheet_group_manager","hr.timesheet.group.manager","model_hr_timesheet_group","hr.group_hr_manager",1,1,1,1
+"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","hr.group_hr_manager",1,1,1,1
+"access_hr_department_manager","hr.department.manager","model_hr_department","hr.group_hr_manager",1,1,1,1
diff --git a/addons/hr_attendance/__terp__.py b/addons/hr_attendance/__terp__.py
index 0dd9eff1013..c6a6162bcf9 100644
--- a/addons/hr_attendance/__terp__.py
+++ b/addons/hr_attendance/__terp__.py
@@ -9,7 +9,8 @@
"update_xml" : [
"hr_attendance_view.xml",
"hr_attendance_wizard.xml",
- "hr_attendance_report.xml"
+ "hr_attendance_report.xml",
+ "security/ir.model.access.csv",
],
"active": False,
"installable": True,
diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv
new file mode 100644
index 00000000000..b96c0e6be0d
--- /dev/null
+++ b/addons/hr_attendance/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_hr_action_reason_employee","hr action reason employee","model_hr_action_reason","hr.group_hr_user",1,1,1,1
+"access_hr_attendance_employee","hr attendance employee","model_hr_attendance","hr.group_hr_user",1,1,1,1
diff --git a/addons/hr_contract/__terp__.py b/addons/hr_contract/__terp__.py
index a03f8140f72..c07e6c55a5a 100644
--- a/addons/hr_contract/__terp__.py
+++ b/addons/hr_contract/__terp__.py
@@ -46,7 +46,7 @@
"demo_xml" : [],
"update_xml" : [
"security/hr_contract_security.xml",
-# "security/ir.model.access.csv",
+ "security/ir.model.access.csv",
"hr_contract_view.xml",
],
"active": False,
diff --git a/addons/hr_contract/i18n/fr_FR.po b/addons/hr_contract/i18n/fr_FR.po
index 01606b1ab15..3d3d3dbcf2a 100644
--- a/addons/hr_contract/i18n/fr_FR.po
+++ b/addons/hr_contract/i18n/fr_FR.po
@@ -4,147 +4,151 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 16:25+0000\n"
+"PO-Revision-Date: 2008-10-13 11:14+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-13 11:44+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_contract
#: field:hr.contract,wage:0
msgid "Wage"
-msgstr ""
+msgstr "Salaire"
#. module: hr_contract
#: selection:hr.contract.wage.type,type:0
msgid "Gross"
-msgstr ""
+msgstr "Brut"
#. module: hr_contract
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: hr_contract
#: view:hr.contract:0
#: view:hr.employee:0
msgid "Generalities"
-msgstr ""
+msgstr "Généralités"
#. module: hr_contract
#: field:hr.employee,children:0
msgid "Number of children"
-msgstr ""
+msgstr "Nombre d'Enfants"
#. module: hr_contract
#: field:hr.contract.wage.type,factor_type:0
msgid "Factor for hour cost"
-msgstr ""
+msgstr "Facteur pour le coût horaire"
#. module: hr_contract
#: view:hr.contract.wage.type:0
msgid "Wage Types"
-msgstr ""
+msgstr "Types de Salaire"
#. module: hr_contract
#: field:hr.employee,soc_security:0
msgid "Social security number"
-msgstr ""
+msgstr "Numéro de Sécurité Sociale"
#. module: hr_contract
#: field:hr.contract,employee_id:0
msgid "Employee"
-msgstr ""
+msgstr "Employé"
#. module: hr_contract
#: selection:hr.contract.wage.type,type:0
msgid "Net"
-msgstr ""
+msgstr "Net"
#. module: hr_contract
#: field:hr.contract.wage.type,type:0
msgid "Type"
-msgstr ""
+msgstr "Type"
#. module: hr_contract
#: field:hr.contract.wage.type.period,factor_days:0
msgid "Hours in the period"
-msgstr ""
+msgstr "# d'Heures dans la période"
#. module: hr_contract
#: field:hr.contract,function:0
msgid "Function"
-msgstr ""
+msgstr "Fonction"
#. module: hr_contract
#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type
#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type
msgid "Contract Wage Type"
-msgstr ""
+msgstr "Type de COntrat Salarial"
#. module: hr_contract
#: view:hr.employee:0
msgid "Miscelleanous"
-msgstr ""
+msgstr "Divers"
#. module: hr_contract
#: field:hr.employee,contract_ids:0
#: view:hr.contract:0
#: view:hr.employee:0
msgid "Contracts"
-msgstr ""
+msgstr "Contrats"
#. module: hr_contract
#: model:ir.model,name:hr_contract.model_hr_contract_wage_type
#: field:hr.contract,wage_type_id:0
#: view:hr.contract.wage.type:0
msgid "Wage Type"
-msgstr ""
+msgstr "Type de salaire"
#. module: hr_contract
#: field:hr.contract.wage.type.period,name:0
msgid "Period Name"
-msgstr ""
+msgstr "Nom de la Période"
#. module: hr_contract
#: model:ir.model,name:hr_contract.model_hr_employee_marital_status
msgid "Employee Marital Status"
-msgstr ""
+msgstr "État Matrimonial de l'Employé"
#. module: hr_contract
#: field:hr.employee,medic_exam:0
msgid "Medical examination date"
-msgstr ""
+msgstr "Date de l'Examen Médical"
#. module: hr_contract
#: field:hr.contract.wage.type,name:0
msgid "Wage Type Name"
-msgstr ""
+msgstr "Nom du Type de Salaire"
#. module: hr_contract
#: field:hr.contract,working_hours_per_day:0
msgid "Working hours per day"
-msgstr ""
+msgstr "Heures de Travail par Jour"
#. module: hr_contract
#: view:hr.employee:0
msgid "Salary"
-msgstr ""
+msgstr "Salaire"
#. module: hr_contract
#: field:hr.contract,date_end:0
msgid "End Date"
-msgstr ""
+msgstr "Date de fin"
#. module: hr_contract
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue!"
#. module: hr_contract
#: field:hr.contract,notes:0
@@ -160,28 +164,28 @@ msgstr "Notes"
#: view:hr.contract:0
#: view:hr.employee:0
msgid "Contract"
-msgstr ""
+msgstr "Contrat"
#. module: hr_contract
#: view:hr.contract.type:0
msgid "Contract Type"
-msgstr ""
+msgstr "Type de Contrat"
#. module: hr_contract
#: model:ir.model,name:hr_contract.model_hr_contract_wage_type_period
#: field:hr.contract.wage.type,period_id:0
msgid "Wage Period"
-msgstr ""
+msgstr "Période Salariale"
#. module: hr_contract
#: field:hr.employee,nationality:0
msgid "Nationality"
-msgstr ""
+msgstr "Nationalité"
#. module: hr_contract
#: view:hr.contract.wage.type:0
msgid "Hourly cost computation"
-msgstr ""
+msgstr "Calcul du côut horaire"
#. module: hr_contract
#: field:hr.employee,audiens_num:0
@@ -191,12 +195,12 @@ msgstr ""
#. module: hr_contract
#: view:hr.contract:0
msgid "Remuneration"
-msgstr ""
+msgstr "Rémuneration"
#. module: hr_contract
#: field:hr.contract,name:0
msgid "Contract Name"
-msgstr ""
+msgstr "Nom du Contrat"
#. module: hr_contract
#: model:ir.actions.act_window,name:hr_contract.action_hr_marital_status
@@ -205,49 +209,52 @@ msgstr ""
#: model:ir.ui.menu,name:hr_contract.hr_menu_marital_status
#: view:hr.employee.marital.status:0
msgid "Marital Status"
-msgstr ""
+msgstr "État matrimonial"
#. module: hr_contract
#: field:hr.employee,place_of_birth:0
msgid "Place of Birth"
-msgstr ""
+msgstr "Lieu de Naissance"
#. module: hr_contract
#: field:hr.employee,manager:0
msgid "Manager"
-msgstr ""
+msgstr "Gestionnaire"
#. module: hr_contract
#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type_period
#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type_period
#: view:hr.contract.wage.type.period:0
msgid "Wage period"
-msgstr ""
+msgstr "Période Salariale"
#. module: hr_contract
#: help:hr.contract.wage.type,factor_type:0
#: help:hr.contract.wage.type.period,factor_days:0
-msgid "This field is used by the timesheet system to compute the price of an hour of work wased on the contract of the employee"
+msgid ""
+"This field is used by the timesheet system to compute the price of an hour "
+"of work wased on the contract of the employee"
msgstr ""
+"Ce champ est utilisé par le système de feuille de temps pour calculer le "
+"prix d'une heure de travail basé sur le contrat de l'employé"
#. module: hr_contract
#: field:hr.contract,date_start:0
msgid "Start Date"
-msgstr ""
+msgstr "Date de début"
#. module: hr_contract
#: view:hr.contract:0
#: view:hr.employee:0
msgid "Contract Duration"
-msgstr ""
+msgstr "Durée du Contrat"
#. module: hr_contract
#: field:hr.employee.marital.status,description:0
msgid "Status Description"
-msgstr ""
+msgstr "Description du Statut"
#. module: hr_contract
#: field:hr.employee,birth_date:0
msgid "Birth Date"
-msgstr ""
-
+msgstr "Date de naissance"
diff --git a/addons/hr_contract/security/ir.model.access.csv b/addons/hr_contract/security/ir.model.access.csv
index a9a7e3d5219..053b5c42ecd 100644
--- a/addons/hr_contract/security/ir.model.access.csv
+++ b/addons/hr_contract/security/ir.model.access.csv
@@ -1,5 +1,11 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_hr_employee_marital_status,hr.employee.marital.status,model_hr_employee_marital_status,hr.group_hr_user,1,1,1,1
-access_hr_contract_wage_type_period,hr.contract.wage.type.period,model_hr_contract_wage_type_period,hr.group_hr_manager,1,1,1,1
-access_hr_contract_wage_type,hr.contract.wage.type,model_hr_contract_wage_type,hr.group_hr_manager,1,1,1,1
-access_hr_contract,hr.contract,model_hr_contract,group_hr_contract,1,1,1,1
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_hr_employee_marital_status","hr.employee.marital.status","model_hr_employee_marital_status","hr.group_hr_user",1,1,1,1
+"access_hr_contract_wage_type_period_user","hr.contract.wage.type.period user","model_hr_contract_wage_type_period","hr.group_hr_user",1,0,0,0
+"access_hr_contract_wage_type_period","hr.contract.wage.type.period","model_hr_contract_wage_type_period","hr.group_hr_manager",1,1,1,1
+"access_hr_contract_wage_type_user","hr.contract.wage.type user","model_hr_contract_wage_type","hr.group_hr_user",1,0,0,0
+"access_hr_contract_wage_type","hr.contract.wage.type","model_hr_contract_wage_type","hr.group_hr_manager",1,1,1,1
+"access_hr_contract_wage_type_contract","hr.contract.wage.type contract","model_hr_contract_wage_type","group_hr_contract",1,1,1,1
+"access_hr_contract_wage_type_period_contract","hr.contract.wage.type.period contract","model_hr_contract_wage_type_period","group_hr_contract",1,1,1,1
+"access_hr_contract_user","hr.contract user","model_hr_contract","hr.group_hr_user",1,0,0,0
+"access_hr_contract","hr.contract","model_hr_contract","group_hr_contract",1,1,1,1
+"access_hr_employee_contract","hr.employee contract","hr.model_hr_employee","group_hr_contract",1,0,0,0
diff --git a/addons/hr_expense/i18n/fr_FR.po b/addons/hr_expense/i18n/fr_FR.po
index 6529569c4ce..bf065f55e63 100644
--- a/addons/hr_expense/i18n/fr_FR.po
+++ b/addons/hr_expense/i18n/fr_FR.po
@@ -4,375 +4,366 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 16:25+0000\n"
+"PO-Revision-Date: 2008-10-13 11:30+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-13 11:52+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "Accounting data"
-msgstr ""
+msgstr "Données Comptables"
#. module: hr_expense
#: rml:hr.expense:0
msgid "Employee:"
-msgstr ""
+msgstr "Employé:"
#. module: hr_expense
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: hr_expense
#: model:ir.model,name:hr_expense.model_hr_expense_line
msgid "Expense Line"
-msgstr ""
+msgstr "Ligne de dépense"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "Confirm"
-msgstr ""
+msgstr "Confirmer"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "Other Info"
-msgstr ""
+msgstr "Autre information"
#. module: hr_expense
#: rml:hr.expense:0
msgid "Date:"
-msgstr ""
+msgstr "Date :"
#. module: hr_expense
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue!"
#. module: hr_expense
#: model:ir.actions.act_window,name:hr_expense.expense_all_draft
#: model:ir.ui.menu,name:hr_expense.menu_expense_all_draft
msgid "Draft expenses"
-msgstr ""
+msgstr "Dépenses Brouillon"
#. module: hr_expense
#: field:hr.expense.expense,note:0
msgid "Note"
-msgstr ""
+msgstr "Note"
#. module: hr_expense
#: field:hr.expense.expense,state:0
msgid "State"
-msgstr ""
+msgstr "État"
#. module: hr_expense
#: field:hr.expense.line,unit_amount:0
msgid "Unit Price"
-msgstr ""
+msgstr "Prix unitaire"
#. module: hr_expense
#: model:ir.actions.act_window,name:hr_expense.expense_all_confirm
#: model:ir.ui.menu,name:hr_expense.menu_expense_all_confirm
msgid "Expenses waiting validation"
-msgstr ""
+msgstr "Dépenses en attende de validation"
#. module: hr_expense
#: field:hr.expense.expense,date_valid:0
msgid "Date Valided"
-msgstr ""
+msgstr "Date de la Validation"
#. module: hr_expense
#: field:hr.expense.expense,employee_id:0
msgid "Employee"
-msgstr ""
+msgstr "Employé"
#. module: hr_expense
#: field:hr.expense.expense,date_confirm:0
msgid "Date Confirmed"
-msgstr ""
+msgstr "Date de la Confirmation"
#. module: hr_expense
#: field:hr.expense.line,analytic_account:0
msgid "Analytic account"
-msgstr ""
+msgstr "Compte analytique"
#. module: hr_expense
#: model:ir.ui.menu,name:hr_expense.next_id_49
#: view:hr.expense.expense:0
msgid "Expenses"
-msgstr ""
+msgstr "Dépenses"
#. module: hr_expense
#: selection:hr.expense.expense,state:0
msgid "Waiting confirmation"
-msgstr ""
+msgstr "En Attente de Confirmation"
#. module: hr_expense
#: model:ir.actions.act_window,name:hr_expense.expense_all_valid
#: model:ir.ui.menu,name:hr_expense.menu_expense_all_valid
msgid "Expenses waiting invoice"
-msgstr ""
+msgstr "Dépenses attendant la facture"
#. module: hr_expense
#: field:hr.expense.line,product_id:0
msgid "Product"
-msgstr ""
+msgstr "Produit"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "Validation"
-msgstr ""
-
-#. module: hr_expense
-#, python-format
-#: code:addons/hr_expense/hr_expense.py:0
-msgid "Error !"
-msgstr ""
+msgstr "Validation"
#. module: hr_expense
#: field:hr.expense.line,description:0
msgid "Description"
-msgstr ""
+msgstr "Description"
#. module: hr_expense
#: model:ir.actions.act_window,name:hr_expense.expense_my
#: model:ir.ui.menu,name:hr_expense.menu_expense_my
msgid "My Expenses"
-msgstr ""
+msgstr "Mes Dépenses"
#. module: hr_expense
#: selection:hr.expense.expense,state:0
msgid "Canceled"
-msgstr ""
+msgstr "Annulé"
#. module: hr_expense
#: field:hr.expense.expense,name:0
#: view:hr.expense.expense:0
msgid "Expense Sheet"
-msgstr ""
+msgstr "Feuille de Dépense"
#. module: hr_expense
#: rml:hr.expense:0
#: field:hr.expense.line,unit_quantity:0
msgid "Quantities"
-msgstr ""
+msgstr "Quantités"
#. module: hr_expense
#: field:hr.expense.expense,amount:0
msgid "Total Amount"
-msgstr ""
+msgstr "Montant Total"
#. module: hr_expense
#: field:hr.expense.expense,id:0
msgid "Sheet ID"
-msgstr ""
+msgstr "ID de la feuille"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "Set to Draft"
-msgstr ""
+msgstr "Mettre au brouillon"
#. module: hr_expense
#: field:hr.expense.expense,journal_id:0
msgid "Force Journal"
-msgstr ""
+msgstr "Forcer le Journal"
#. module: hr_expense
#: field:hr.expense.expense,user_id:0
msgid "User"
-msgstr ""
+msgstr "Utilisateur"
#. module: hr_expense
#: model:ir.actions.act_window,name:hr_expense.expense_my_confirm
#: model:ir.ui.menu,name:hr_expense.menu_expense_my_confirm
msgid "My expenses waiting validation"
-msgstr ""
+msgstr "Mes Dépenses en attende de validation"
#. module: hr_expense
#: rml:hr.expense:0
#: field:hr.expense.expense,date:0
#: field:hr.expense.line,date_value:0
msgid "Date"
-msgstr ""
+msgstr "Date"
#. module: hr_expense
#: selection:hr.expense.expense,state:0
msgid "Accepted"
-msgstr ""
+msgstr "Accepté"
#. module: hr_expense
#: model:ir.ui.menu,name:hr_expense.menu_expense_all
msgid "All expenses"
-msgstr ""
+msgstr "Toutes les Dépenses"
#. module: hr_expense
#: rml:hr.expense:0
msgid "Reference:"
-msgstr ""
+msgstr "Réference :"
#. module: hr_expense
#: rml:hr.expense:0
msgid "(Date and signature)"
-msgstr ""
+msgstr "(Date et Signature)"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "Refuse"
-msgstr ""
+msgstr "Refuser"
#. module: hr_expense
#: rml:hr.expense:0
msgid "Name"
-msgstr ""
+msgstr "Nom"
#. module: hr_expense
#: rml:hr.expense:0
msgid "Total:"
-msgstr ""
+msgstr "Total:"
#. module: hr_expense
#: field:hr.expense.line,name:0
msgid "Short Description"
-msgstr ""
+msgstr "Brève Description"
#. module: hr_expense
#: rml:hr.expense:0
msgid "HR Expenses"
-msgstr ""
-
-#. module: hr_expense
-#, python-format
-#: code:addons/hr_expense/hr_expense.py:0
-msgid "The employee must have a contact address"
-msgstr ""
+msgstr "Dépense HR"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "Notes"
-msgstr ""
+msgstr "Notes"
#. module: hr_expense
#: selection:hr.expense.expense,state:0
msgid "Reimbursed"
-msgstr ""
+msgstr "Remboursée"
#. module: hr_expense
#: field:hr.expense.expense,account_move_id:0
msgid "Account Move"
-msgstr ""
+msgstr "Mouvement de Compte"
#. module: hr_expense
#: model:ir.model,name:hr_expense.model_hr_expense_expense
#: field:hr.expense.line,expense_id:0
msgid "Expense"
-msgstr ""
+msgstr "Dépense"
#. module: hr_expense
#: field:hr.expense.expense,line_ids:0
#: view:hr.expense.expense:0
#: view:hr.expense.line:0
msgid "Expense Lines"
-msgstr ""
+msgstr "Ligne de Dépense"
#. module: hr_expense
#: rml:hr.expense:0
msgid "This document must be dated and signed for reimbursment"
-msgstr ""
+msgstr "Ce document doit être daté et signé pour remboursement"
#. module: hr_expense
#: rml:hr.expense:0
#: field:hr.expense.expense,ref:0
#: field:hr.expense.line,ref:0
msgid "Reference"
-msgstr ""
+msgstr "Référence"
#. module: hr_expense
#: field:hr.expense.line,sequence:0
msgid "Sequence"
-msgstr ""
+msgstr "Séquence"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "Expenses Sheet"
-msgstr ""
+msgstr "Feuille de Dépense"
#. module: hr_expense
#: rml:hr.expense:0
msgid "Certified honest and conform,"
-msgstr ""
+msgstr "Certifié honête et conforme,"
#. module: hr_expense
#: model:ir.actions.act_window,name:hr_expense.expense_all_invoiced
#: model:ir.ui.menu,name:hr_expense.menu_expense_all_invoiced
msgid "Expenses waiting payment"
-msgstr ""
+msgstr "Dépenses en attente d'un paiement"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "Accept"
-msgstr ""
+msgstr "Accepter"
#. module: hr_expense
#: model:ir.actions.act_window,name:hr_expense.expense_my_draft
#: model:ir.ui.menu,name:hr_expense.menu_expense_my_draft
msgid "My Draft expenses"
-msgstr ""
+msgstr "Mes dépenses Brouillon"
#. module: hr_expense
#: field:hr.expense.expense,currency_id:0
msgid "Currency"
-msgstr ""
+msgstr "Devise"
#. module: hr_expense
#: rml:hr.expense:0
msgid "Unit price"
-msgstr ""
+msgstr "Prix Unitaire"
#. module: hr_expense
#: field:hr.expense.line,uom_id:0
msgid "UoM"
-msgstr ""
+msgstr "UdM"
#. module: hr_expense
#: field:hr.expense.expense,invoice_id:0
#: view:hr.expense.expense:0
msgid "Invoice"
-msgstr ""
+msgstr "Facture"
#. module: hr_expense
#: field:hr.expense.expense,user_valid:0
msgid "Validation User"
-msgstr ""
+msgstr "Utilisateur pour la Validation"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
#. module: hr_expense
#: selection:hr.expense.expense,state:0
msgid "Draft"
-msgstr ""
+msgstr "Brouillon"
#. module: hr_expense
#: rml:hr.expense:0
#: field:hr.expense.line,total_amount:0
msgid "Total"
-msgstr ""
+msgstr "Total"
#. module: hr_expense
#: model:ir.actions.report.xml,name:hr_expense.hr_expenses
msgid "Print HR expenses"
-msgstr ""
+msgstr "Imprimer les Dépenses HR"
#. module: hr_expense
#: selection:hr.expense.expense,state:0
msgid "Invoiced"
-msgstr ""
-
+msgstr "Facturée"
diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
index 7ab564bf011..82321f43dec 100644
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -59,6 +59,14 @@
+
+
+
+
+
+
+
+
@@ -104,6 +112,7 @@
+
@@ -201,6 +210,46 @@
[[ company.currency_id.name ]]
|
+
+ |
+
+
+
+ |
+
+ [[ format(line.analytic_account and line.analytic_account.complete_name or removeParentNode('tr')) ]]
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
@@ -248,4 +297,4 @@
This document must be dated and signed for reimbursment
-
+
\ No newline at end of file
diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv
index ea8c924ddb6..aa00dab4fa1 100644
--- a/addons/hr_expense/security/ir.model.access.csv
+++ b/addons/hr_expense/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_hr_expense_expense,hr.expense.expense,model_hr_expense_expense,base.group_user,1,1,1,1
-access_hr_expense_line,hr.expense.line,model_hr_expense_line,base.group_user,1,1,1,1
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_hr_expense_expense","hr.expense.expense","model_hr_expense_expense","hr.group_hr_user",1,1,1,1
+"access_hr_expense_line","hr.expense.line","model_hr_expense_line","hr.group_hr_user",1,1,1,1
diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__terp__.py
index 6f3188d6acf..982b5624c19 100644
--- a/addons/hr_holidays/__terp__.py
+++ b/addons/hr_holidays/__terp__.py
@@ -32,7 +32,7 @@
"hr_view.xml",
"hr_holidays_report.xml",
"hr_holidays_wizard.xml",
-# "process/hr_holidays_process.xml"
+ "process/hr_holidays_process.xml"
],
# "demo_xml" : ["hr_bel_holidays_2008.xml",],
"demo_xml" : [],
diff --git a/addons/hr_holidays/hr_holidays_report.xml b/addons/hr_holidays/hr_holidays_report.xml
index 85c4f69649e..2d89b467c26 100644
--- a/addons/hr_holidays/hr_holidays_report.xml
+++ b/addons/hr_holidays/hr_holidays_report.xml
@@ -9,17 +9,6 @@
auto="False"
menu="False"/>
-
-
+
diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml
index 325768afbef..475da254cdf 100644
--- a/addons/hr_holidays/hr_holidays_wizard.xml
+++ b/addons/hr_holidays/hr_holidays_wizard.xml
@@ -10,6 +10,11 @@
type="wizard"
id="menu_holidays_summary"/>
+
+
+
diff --git a/addons/hr_holidays/i18n/fr_FR.po b/addons/hr_holidays/i18n/fr_FR.po
index 9811de832e5..d0e47845b9e 100644
--- a/addons/hr_holidays/i18n/fr_FR.po
+++ b/addons/hr_holidays/i18n/fr_FR.po
@@ -4,16 +4,17 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 16:30+0000\n"
+"PO-Revision-Date: 2008-10-13 11:55+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-13 12:04+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_holidays
#: view:hr.holidays.status:0
@@ -23,18 +24,18 @@ msgstr "Définir les types de congés"
#. module: hr_holidays
#: wizard_view:hr.holidays.summary,notify:0
msgid "You have to select atleast 1 Department. Try again."
-msgstr ""
+msgstr "Vous devez sélectionner au moins 1 département. Essayez à nouveau."
#. module: hr_holidays
#: selection:hr.holidays,state:0
msgid "Confirmed"
-msgstr ""
+msgstr "Confirmé"
#. module: hr_holidays
#: wizard_field:hr.holidays.summary,init,date_from:0
#: wizard_field:hr.holidays.summary.employee,init,date_from:0
msgid "From"
-msgstr ""
+msgstr "De"
#. module: hr_holidays
#: view:hr.holidays:0
@@ -44,28 +45,28 @@ msgstr "Congés"
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Confirm"
-msgstr ""
+msgstr "Confirmer"
#. module: hr_holidays
#: wizard_view:hr.holidays.summary,notify:0
#: wizard_view:hr.holidays.summary.employee,notify:0
msgid "Notification"
-msgstr ""
+msgstr "Notification"
#. module: hr_holidays
#: field:hr.holidays.status,section_id:0
msgid "Section"
-msgstr ""
+msgstr "Section"
#. module: hr_holidays
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue!"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Light Coral"
-msgstr ""
+msgstr "Corail clair"
#. module: hr_holidays
#: field:hr.holidays,employee_id:0
@@ -77,124 +78,127 @@ msgstr "Employé"
#: model:ir.actions.wizard,name:hr_holidays.holidays_summary
#: model:ir.ui.menu,name:hr_holidays.menu_holidays_summary
msgid "Print Summary of Holidays"
-msgstr ""
+msgstr "Imprimer le résumé des Vacances"
#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_available
#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_available
msgid "My Available Holidays"
-msgstr ""
+msgstr "Mes Vacances Disponibles"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Black"
-msgstr ""
+msgstr "Noir"
#. module: hr_holidays
#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_refuse
msgid "My Refused Holidays Requests"
-msgstr ""
+msgstr "Mes Demandes de Vacances Refusées"
#. module: hr_holidays
#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_waiting
msgid "My Awaiting Confirmation Holidays Requests"
-msgstr ""
+msgstr "Mes Demandes de Vacances en attende de Confirmation"
#. module: hr_holidays
#: wizard_button:hr.holidays.summary,init,checkdept:0
#: wizard_button:hr.holidays.summary.employee,init,checkemp:0
msgid "Print"
-msgstr ""
+msgstr "Imprimer"
#. module: hr_holidays
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting
msgid "Requests Awaiting for Validation"
-msgstr ""
+msgstr "Demandes en attende de Validation"
#. module: hr_holidays
#: selection:hr.holidays,state:0
msgid "Refused"
-msgstr ""
+msgstr "Refusée"
#. module: hr_holidays
#: field:hr.holidays.per.user,max_leaves:0
msgid "Maximum Leaves Allowed"
-msgstr ""
+msgstr "Nombre Maximum de Congés Permis"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Light Blue"
-msgstr ""
+msgstr "Bleu clair"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Red"
-msgstr ""
+msgstr "Rouge"
#. module: hr_holidays
#: wizard_field:hr.holidays.summary,init,depts:0
msgid "Department(s)"
-msgstr ""
+msgstr "Département(s)"
#. module: hr_holidays
#: field:hr.holidays,state:0
msgid "Status"
-msgstr ""
+msgstr "État"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Brown"
-msgstr ""
+msgstr "Brun"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Light Salmon"
-msgstr ""
+msgstr "Saumon clair"
#. module: hr_holidays
#: view:hr.holidays.per.user:0
msgid "Holidays Allowed"
-msgstr ""
+msgstr "Vacances Permises"
#. module: hr_holidays
-#: xsl:holidays.summary:0
+#: xsl:hr.holidays.holidays_summary:0
msgid "of the"
-msgstr ""
+msgstr "du"
#. module: hr_holidays
-#: xsl:holidays.summary:0
+#: xsl:hr.holidays.holidays_summary:0
msgid "Off-Days' Summary"
-msgstr ""
+msgstr "Résumé des Congés"
#. module: hr_holidays
#: field:hr.holidays.per.user,leaves_taken:0
msgid "Leaves Already Taken"
-msgstr ""
+msgstr "Congés déjà pris"
#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday
msgid "My Holidays Request"
-msgstr ""
+msgstr "Mes Demandes de Congés"
#. module: hr_holidays
#: field:hr.holidays.status,color_name:0
msgid "Color of the status"
-msgstr ""
+msgstr "Couleur du Statut"
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Number of Days"
-msgstr ""
+msgstr "Nombre de jour"
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Set to Draft"
-msgstr ""
+msgstr "Mettre au brouillon"
#. module: hr_holidays
#: model:ir.model,name:hr_holidays.model_hr_holidays
@@ -202,75 +206,75 @@ msgid "Holidays"
msgstr "Vacances"
#. module: hr_holidays
-#: xsl:holidays.summary:0
+#: xsl:hr.holidays.holidays_summary:0
msgid "to"
-msgstr ""
+msgstr "à"
#. module: hr_holidays
-#: xsl:holidays.summary:0
+#: xsl:hr.holidays.holidays_summary:0
msgid "holidays."
-msgstr ""
+msgstr "Vacances"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Light Cyan"
-msgstr ""
+msgstr "Cyan clair"
#. module: hr_holidays
#: selection:hr.holidays,state:0
msgid "draft"
-msgstr ""
+msgstr "brouillon"
#. module: hr_holidays
#: field:hr.holidays.per.user,user_id:0
msgid "User"
-msgstr ""
+msgstr "Utilisateur"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Light Green"
-msgstr ""
+msgstr "Vert clair"
#. module: hr_holidays
#: wizard_field:hr.holidays.summary,init,holiday_type:0
#: wizard_field:hr.holidays.summary.employee,init,holiday_type:0
msgid "Select Holiday Type"
-msgstr ""
+msgstr "Sélectionnez le Type de Vacances"
#. module: hr_holidays
#: selection:hr.holidays,state:0
#: view:hr.holidays:0
msgid "Validate"
-msgstr ""
+msgstr "Valider"
#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
#: field:hr.holidays.status,name:0
#: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
msgid "Holiday Status"
-msgstr ""
+msgstr "Statut des Vacances"
#. module: hr_holidays
#: field:hr.holidays,notes:0
#: field:hr.holidays.per.user,notes:0
msgid "Notes"
-msgstr ""
+msgstr "Notes"
#. module: hr_holidays
#: wizard_view:hr.holidays.summary,init:0
#: wizard_view:hr.holidays.summary.employee,init:0
msgid "Report Options"
-msgstr ""
+msgstr "Options du Rapport"
#. module: hr_holidays
#: field:hr.holidays,case_id:0
msgid "Case"
-msgstr ""
+msgstr "Cas"
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Refuse"
-msgstr ""
+msgstr "Refuser"
#. module: hr_holidays
#: field:hr.holidays,user_id:0
@@ -281,27 +285,27 @@ msgstr ""
#: wizard_button:hr.holidays.summary,notify,end:0
#: wizard_button:hr.holidays.summary.employee,notify,end:0
msgid "Ok"
-msgstr ""
+msgstr "Ok"
#. module: hr_holidays
#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_draft
msgid "My Draft Holidays Requests"
-msgstr ""
+msgstr "Mes Demandes de Vacances Brouillon"
#. module: hr_holidays
#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday
msgid "My Holidays Requests"
-msgstr ""
+msgstr "Mes Demandes de Vacances"
#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_waiting
msgid "My Holidays Request Waiting confirmation"
-msgstr ""
+msgstr "Mes Demandes de Vacances en attente de Confirmation"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Violet"
-msgstr ""
+msgstr "Violet"
#. module: hr_holidays
#: field:hr.holidays,holiday_status:0
@@ -312,49 +316,49 @@ msgstr "Type de congés"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Ivory"
-msgstr ""
+msgstr "Ivoire"
#. module: hr_holidays
#: field:hr.holidays,manager_id:0
msgid "Holiday manager"
-msgstr ""
+msgstr "Gestionnaire de Vacances"
#. module: hr_holidays
-#: xsl:holidays.summary:0
+#: xsl:hr.holidays.holidays_summary:0
msgid "Analyze from"
-msgstr ""
+msgstr "Analyser de"
#. module: hr_holidays
#: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
msgid "Summary Of Holidays"
-msgstr ""
+msgstr "Résumé des Vacances"
#. module: hr_holidays
#: wizard_field:hr.holidays.summary.employee,init,emp:0
msgid "Employee(s)"
-msgstr ""
+msgstr "Employés"
#. module: hr_holidays
#: field:hr.holidays,number_of_days:0
msgid "Number of Days in this Holiday Request"
-msgstr ""
+msgstr "Nombre de Jours dans cette Demande de Congé"
#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user
#: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user
#: view:hr.holidays.per.user:0
msgid "Holidays Per Employee"
-msgstr ""
+msgstr "Congés par Employé"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Wheat"
-msgstr ""
+msgstr "Blé"
#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_draft
msgid "My Holidays Request Draft"
-msgstr ""
+msgstr "Mes Demandes de Vacances Brouillon"
#. module: hr_holidays
#: view:hr.holidays.status:0
@@ -364,7 +368,7 @@ msgstr "Types de congés"
#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_validate
msgid "My Holidays Request Validated"
-msgstr ""
+msgstr "Mes Demandes de Vacances Validée"
#. module: hr_holidays
#: field:hr.holidays,name:0
@@ -374,27 +378,27 @@ msgstr "Description"
#. module: hr_holidays
#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
msgid "Holidays Request"
-msgstr ""
+msgstr "Demandes de Vacances"
#. module: hr_holidays
#: wizard_view:hr.holidays.summary.employee,notify:0
msgid "You have to select at least 1 Employee. Try again."
-msgstr ""
+msgstr "Vous devez sélectionner au moins 1 employé. Veuillez réessayez."
#. module: hr_holidays
#: model:ir.ui.menu,name:hr_holidays.menu_action_holiday_waiting
msgid "Holidays Requests Awaiting for Validation"
-msgstr ""
+msgstr "Demandes de Vacances en attente de Validation"
#. module: hr_holidays
#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_validate
msgid "My Validated Holidays Requests"
-msgstr ""
+msgstr "Mes Demandes de Vacances Validée"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Light Yellow"
-msgstr ""
+msgstr "Jaune clair"
#. module: hr_holidays
#: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -404,7 +408,7 @@ msgstr "Statut des vacances"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Light Pink"
-msgstr ""
+msgstr "Rose clair"
#. module: hr_holidays
#: field:hr.holidays,date_to:0
@@ -414,7 +418,7 @@ msgstr "Fin du congé"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Lavender"
-msgstr ""
+msgstr "Lavande"
#. module: hr_holidays
#: field:hr.holidays,date_from:0
@@ -424,12 +428,12 @@ msgstr "Début du congé"
#. module: hr_holidays
#: model:ir.ui.menu,name:hr_holidays.menu_action_all_holiday
msgid "All Holidays Requests"
-msgstr ""
+msgstr "Toutes les Demandes de Vacances"
#. module: hr_holidays
#: model:ir.actions.wizard,name:hr_holidays.wizard_holidays_summary
msgid "Print Summary of Employee's Holidays"
-msgstr ""
+msgstr "Imprimer un Résumé des Vacances de l'employé"
#. module: hr_holidays
#: wizard_button:hr.holidays.summary,init,end:0
@@ -437,20 +441,19 @@ msgstr ""
#: selection:hr.holidays,state:0
#: view:hr.holidays:0
msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Magenta"
-msgstr ""
+msgstr "Magenta"
#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_refuse
msgid "My Holidays Request Refused"
-msgstr ""
+msgstr "Mes Demandes de Vacances Refusée"
#. module: hr_holidays
#: model:ir.model,name:hr_holidays.model_hr_holidays_per_user
msgid "Holidays Per User"
-msgstr ""
-
+msgstr "Vacnaces par Utilisateur"
diff --git a/addons/hr_holidays/process/hr_holidays_process.xml b/addons/hr_holidays/process/hr_holidays_process.xml
new file mode 100644
index 00000000000..4cbddc9c423
--- /dev/null
+++ b/addons/hr_holidays/process/hr_holidays_process.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index 69619dde43d..b095b8bf50d 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -1,2 +1,4 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_hr_holidays_per_user,hr.holidays.per.user,model_hr_holidays_per_user,base.group_user,1,1,1,1
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_hr_holidays_per_user","hr.holidays.per.user","model_hr_holidays_per_user","hr.group_hr_user",1,1,1,1
+"access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","hr.group_hr_user",1,1,1,1
+"access_hr_holidays_user","hr holidays user","model_hr_holidays","hr.group_hr_user",1,1,1,1
diff --git a/addons/hr_timesheet/i18n/fr_FR.po b/addons/hr_timesheet/i18n/fr_FR.po
index bf3a595b844..fda6d1ca2da 100644
--- a/addons/hr_timesheet/i18n/fr_FR.po
+++ b/addons/hr_timesheet/i18n/fr_FR.po
@@ -4,16 +4,17 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 16:28+0000\n"
+"PO-Revision-Date: 2008-10-13 15:49+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-14 11:51+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet
#: wizard_view:hr.analytical.timesheet,init:0
@@ -23,15 +24,18 @@ msgstr "Choisissez le mois"
#. module: hr_timesheet
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: hr_timesheet
#: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
#: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet
#: model:ir.ui.menu,name:hr_timesheet.menu_wizard_hr_timesheet
msgid "Employee timesheet"
-msgstr "Feuille de temps de l'employé"
+msgstr "Feuille de présence de l'employé"
#. module: hr_timesheet
#: model:ir.actions.wizard,name:hr_timesheet.si_so
@@ -49,12 +53,6 @@ msgstr "Somme"
msgid "Sign in / Sign out"
msgstr "Pointer l'entrée / Pointer la sortie"
-#. module: hr_timesheet
-#, python-format
-#: code:addons/hr_timesheet/wizard/sign_in_out.py:0
-msgid "No employee defined for your user !"
-msgstr ""
-
#. module: hr_timesheet
#: wizard_button:hr.analytical.timesheet,init,report:0
#: wizard_button:hr.analytical.timesheet.my,init,report:0
@@ -87,18 +85,6 @@ msgstr "Ligne analytique"
msgid "Current Server Date"
msgstr "Date du serveur"
-#. module: hr_timesheet
-#, python-format
-#: code:addons/hr_timesheet/wizard/sign_in_out.py:0
-msgid "No cost unit defined for this employee !"
-msgstr ""
-
-#. module: hr_timesheet
-#, python-format
-#: code:addons/hr_timesheet/hr_timesheet.py:0
-msgid "No analytic journal available for this employee.\nDefine an employee for the selected user and assign an analytic journal."
-msgstr ""
-
#. module: hr_timesheet
#: field:hr.employee,product_id:0
msgid "Product"
@@ -113,7 +99,7 @@ msgstr "Journal analytique"
#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_today_form_my
#: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_today_form_my
msgid "My Working Hours of The Day"
-msgstr ""
+msgstr "Mes Heures de Travail du Jour"
#. module: hr_timesheet
#: view:account.analytic.account:0
@@ -145,7 +131,7 @@ msgstr "Timesheet"
#. module: hr_timesheet
#: constraint:product.product:0
msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Erreur: code EAN invalide"
#. module: hr_timesheet
#: wizard_field:hr.analytical.timesheet,init,user_id:0
@@ -162,7 +148,7 @@ msgstr "Pointer l'entrée"
#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_today_form
#: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_today_form
msgid "Working Hours of The Day"
-msgstr ""
+msgstr "Heures de Travail du Jour"
#. module: hr_timesheet
#: wizard_view:hr_timesheet.si_so,sign_out:0
@@ -188,7 +174,7 @@ msgstr "Date de clôture"
#. module: hr_timesheet
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue!"
#. module: hr_timesheet
#: wizard_field:hr_timesheet.si_so,sign_in,analytic_amount:0
@@ -204,6 +190,8 @@ msgstr "Résumé analyse"
#: constraint:product.template:0
msgid "Error: UOS must be in a different category than the UOM"
msgstr ""
+"Erreur: l'unité de vente doit appartenir à une catégorie différente que "
+"l'unité de mesure"
#. module: hr_timesheet
#: wizard_view:hr.analytical.timesheet_users,init:0
@@ -212,8 +200,11 @@ msgstr "Choisir les utilisateurs"
#. module: hr_timesheet
#: constraint:product.template:0
-msgid "Error: The default UOM and the purchase UOM must be in the same category."
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
msgstr ""
+"Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent "
+"faire partie de la même catégorie"
#. module: hr_timesheet
#: wizard_view:hr_timesheet.si_so,sign_in:0
@@ -254,7 +245,7 @@ msgstr "Nom de l'employé"
#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_me_all_form
#: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_me_all_form
msgid "My Working Hours"
-msgstr ""
+msgstr "Mes Heures de Travail"
#. module: hr_timesheet
#: model:ir.actions.report.xml,name:hr_timesheet.report_users_timesheet
@@ -268,12 +259,6 @@ msgstr "Timesheet des employés"
msgid "Stop Working"
msgstr "Arrêter le travail"
-#. module: hr_timesheet
-#, python-format
-#: code:addons/hr_timesheet/wizard/sign_in_out.py:0
-msgid "UserError"
-msgstr ""
-
#. module: hr_timesheet
#: wizard_view:hr_timesheet.si_so,sign_in:0
msgid "(Keep empty for current_time)"
@@ -282,7 +267,7 @@ msgstr "(Garder vide pour la date actuelle)"
#. module: hr_timesheet
#: view:hr.employee:0
msgid "Timesheets"
-msgstr ""
+msgstr "Feuilles de présence"
#. module: hr_timesheet
#: wizard_button:hr_timesheet.si_so,sign_out,si_result:0
@@ -310,7 +295,7 @@ msgstr "Statistiques par mois"
#: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_all_form
#: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_today_form
msgid "Working Hours"
-msgstr ""
+msgstr "Heures de travail"
#. module: hr_timesheet
#: wizard_field:hr_timesheet.si_so,sign_in,account_id:0
@@ -371,14 +356,7 @@ msgstr "Total"
msgid "Change Work"
msgstr "Changer de travail"
-#. module: hr_timesheet
-#, python-format
-#: code:addons/hr_timesheet/hr_timesheet.py:0
-msgid "ValidateError"
-msgstr ""
-
#. module: hr_timesheet
#: view:account.analytic.account:0
msgid "To be invoiced"
msgstr "A facturer"
-
diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv
index 6a9a08f28c0..a718d2bd4ae 100644
--- a/addons/hr_timesheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet/security/ir.model.access.csv
@@ -1,2 +1,2 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_hr_analytic_timesheet,hr.analytic.timesheet,model_hr_analytic_timesheet,base.group_user,1,1,1,1
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_hr_analytic_timesheet","hr.analytic.timesheet","model_hr_analytic_timesheet","hr.group_hr_user",1,1,1,1
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
index 2ae672635a5..794c38abc06 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
@@ -1,15 +1,29 @@
-
+
-
+
-
-
-
-
+
+
+
+
+
-
+
diff --git a/addons/hr_timesheet_invoice/i18n/fr_FR.po b/addons/hr_timesheet_invoice/i18n/fr_FR.po
index 44e5f0ada21..be09f6d127c 100644
--- a/addons/hr_timesheet_invoice/i18n/fr_FR.po
+++ b/addons/hr_timesheet_invoice/i18n/fr_FR.po
@@ -4,16 +4,17 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:42+0000"
-"PO-Revision-Date: 2008-09-11 15:41:42+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 16:22+0000\n"
+"PO-Revision-Date: 2008-10-13 12:01+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-13 12:20+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet_invoice
#: wizard_field:account.analytic.profit,init,date_from:0
@@ -43,12 +44,6 @@ msgstr "Entrées non-facturées"
msgid "Invoicing"
msgstr "Facturation"
-#. module: hr_timesheet_invoice
-#, python-format
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
-msgid "At least on line have no product !"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: rml:account.analytic.profit:0
msgid "Income"
@@ -111,8 +106,11 @@ msgstr "Devise"
#. module: hr_timesheet_invoice
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: hr_timesheet_invoice
#: field:account.analytic.account,pricelist_id:0
@@ -133,7 +131,7 @@ msgstr "Choisissez les comptes que vous désirez facturer"
#. module: hr_timesheet_invoice
#: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
msgid "Total ("
-msgstr "Total "
+msgstr "Total"
#. module: hr_timesheet_invoice
#: wizard_field:hr.timesheet.invoice.create,init,product:0
@@ -158,7 +156,7 @@ msgstr "Période de début"
#. module: hr_timesheet_invoice
#: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
msgid ")"
-msgstr ""
+msgstr ")"
#. module: hr_timesheet_invoice
#: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -189,18 +187,6 @@ msgstr "Choisir"
msgid "to"
msgstr "à"
-#. module: hr_timesheet_invoice
-#, python-format
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
-msgid "Error"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#, python-format
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
-msgid "Balance product needed"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: model:ir.actions.wizard,name:hr_timesheet_invoice.hr_timesheet_invoice_create
msgid "Invoice analytic lines"
@@ -216,7 +202,7 @@ msgstr "Date"
#. module: hr_timesheet_invoice
#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_draft_analytic_accounts
msgid "Draft Analytic Accounts"
-msgstr "Comptes analytiques brouillon"
+msgstr "Compte analytique brouiilon"
#. module: hr_timesheet_invoice
#: rml:account.analytic.profit:0
@@ -248,7 +234,7 @@ msgstr "Créer des factures"
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
#: model:ir.ui.menu,name:hr_timesheet_invoice.hr_timesheet_invoice_factor_view
msgid "Types of Invoicing"
-msgstr ""
+msgstr "Types de Facture"
#. module: hr_timesheet_invoice
#: wizard_field:hr.timesheet.final.invoice.create,init,time:0
@@ -269,30 +255,24 @@ msgstr "Types de facturation"
#. module: hr_timesheet_invoice
#: rml:account.analytic.profit:0
msgid "Theorical"
-msgstr ""
+msgstr "Théorique"
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_tree_invoiced_my
#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree_invoiced_my
msgid "My Uninvoiced Entries"
-msgstr ""
+msgstr "Mes Entrées Non Facturées"
#. module: hr_timesheet_invoice
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue!"
#. module: hr_timesheet_invoice
#: view:hr_timesheet_invoice.factor:0
msgid "Type of invoicing"
msgstr "Type de facturation"
-#. module: hr_timesheet_invoice
-#, python-format
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
-msgid "Please fill a Balance product in the wizard"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_pending_analytic_accounts
#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_pending_analytic_accounts
@@ -319,13 +299,6 @@ msgstr "Code J."
msgid "Invoice rate"
msgstr "Taux de facture"
-#. module: hr_timesheet_invoice
-#, python-format
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
-msgid "Analytic account incomplete"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: wizard_field:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,date2:0
msgid "End of period"
@@ -339,13 +312,7 @@ msgstr "Nom interne"
#. module: hr_timesheet_invoice
#: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
msgid "Balance"
-msgstr "Balance "
-
-#. module: hr_timesheet_invoice
-#, python-format
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:0
-msgid "Error !"
-msgstr ""
+msgstr "Balance"
#. module: hr_timesheet_invoice
#: wizard_view:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init:0
@@ -358,12 +325,6 @@ msgstr "Sélectionnez une période"
msgid "Name of entry"
msgstr "Nom de l'entrée"
-#. module: hr_timesheet_invoice
-#, python-format
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:0
-msgid "You can not modify an invoiced analytic line!"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
msgid "Code"
@@ -378,7 +339,7 @@ msgstr "à"
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_open_invoice_analytic_accounts
#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_open_invoice_analytic_accounts
msgid "Unclosed Invoiceable Accounts"
-msgstr ""
+msgstr "Comptes Facturables Non Cloturés"
#. module: hr_timesheet_invoice
#: wizard_view:hr.timesheet.invoice.create,init:0
@@ -429,7 +390,7 @@ msgstr "Factures finales"
#. module: hr_timesheet_invoice
#: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
msgid "Total"
-msgstr "Total "
+msgstr "Total"
#. module: hr_timesheet_invoice
#: wizard_field:account.analytic.profit,init,journal_ids:0
@@ -444,5 +405,4 @@ msgstr "Montant de la balance"
#. module: hr_timesheet_invoice
#: rml:account.analytic.profit:0
msgid "Invoice rate by user"
-msgstr ""
-
+msgstr "Taux Facturable par Utilisateur"
diff --git a/addons/hr_timesheet_invoice/security/ir.model.access.csv b/addons/hr_timesheet_invoice/security/ir.model.access.csv
index f849d88fbcb..c56f26ab3ee 100644
--- a/addons/hr_timesheet_invoice/security/ir.model.access.csv
+++ b/addons/hr_timesheet_invoice/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_hr_timesheet_invoice_factor,hr_timesheet_invoice.factor,model_hr_timesheet_invoice_factor,base.group_user,1,0,0,0
-access_hr_timesheet_invoice_factor,hr_timesheet_invoice.factor,model_hr_timesheet_invoice_factor,account.group_account_invoice,1,1,1,1
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_hr_timesheet_invoice_factor","hr_timesheet_invoice.factor","model_hr_timesheet_invoice_factor","hr.group_hr_user",1,0,0,0
+"access_hr_timesheet_invoice_factor","hr_timesheet_invoice.factor","model_hr_timesheet_invoice_factor","account.group_account_invoice",1,1,1,1
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
index fbf625be1be..7e8a9ff3887 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
@@ -108,15 +108,7 @@ class final_invoice_create(wizard.interface):
price = 0.0
taxes = product.taxes_id
- taxep = account.partner_id.property_account_tax
- if not taxep.id:
- tax = [x.id for x in taxes or []]
- else:
- tax = [taxep.id]
- for t in taxes:
- if not t.tax_group==taxep.tax_group:
- tax.append(t.id)
-
+ tax = self.pool.get('account.fiscal.position').map_tax(cr, uid, account.partner_id, taxes)
account_id = product.product_tmpl_id.property_account_income.id or product.categ_id.property_account_income_categ.id
curr_line = {
@@ -165,15 +157,8 @@ class final_invoice_create(wizard.interface):
taxes = product.taxes_id
else:
taxes = []
- taxep = account.partner_id.property_account_tax
- if not taxep.id:
- tax = [x.id for x in taxes or []]
- else:
- tax = [taxep.id]
- for t in taxes:
- if not t.tax_group==taxep.tax_group:
- tax.append(t.id)
+ tax = self.pool.get('account.fiscal.position').map_tax(cr, uid, account.partner_id, taxes)
curr_line = {
'price_unit': -amount,
'quantity': 1.0,
@@ -194,15 +179,7 @@ class final_invoice_create(wizard.interface):
product = pool.get('product.product').browse(cr, uid, data['form']['balance_product'], context2)
taxes = product.taxes_id
- taxep = account.partner_id.property_account_tax
- if not taxep.id:
- tax = [x.id for x in taxes or []]
- else:
- tax = [taxep.id]
- for t in taxes:
- if not t.tax_group==taxep.tax_group:
- tax.append(t.id)
-
+ tax = self.pool.get('account.fiscal.position').map_tax(cr, uid, account.partner_id, taxes)
account_id = product.product_tmpl_id.property_account_income.id or product.categ_id.property_account_income_categ.id
curr_line = {
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 52cb8387aa4..1e7c328f9dd 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -113,15 +113,7 @@ class invoice_create(wizard.interface):
price = 0.0
taxes = product.taxes_id
- taxep = account.partner_id.property_account_tax
- if not taxep.id:
- tax = [x.id for x in taxes or []]
- else:
- tax = [taxep.id]
- for t in taxes:
- if not t.tax_group==taxep.tax_group:
- tax.append(t.id)
-
+ tax = self.pool.get('account.fiscal.position').map_tax(cr, uid, account.partner_id, taxes)
account_id = product.product_tmpl_id.property_account_income.id or product.categ_id.property_account_income_categ.id
curr_line = {
diff --git a/addons/hr_timesheet_project/__terp__.py b/addons/hr_timesheet_project/__terp__.py
index 06922784d56..e3c24de5ea0 100644
--- a/addons/hr_timesheet_project/__terp__.py
+++ b/addons/hr_timesheet_project/__terp__.py
@@ -34,7 +34,9 @@
"description": """Auto-complete timesheet based on tasks made on the project management module.""",
"website" : "http://tinyerp.com/module_hr.html",
"depends" : ["project", "hr_timesheet_sheet"],
- "update_xml" : ["hr_timesheet_project_view.xml", "process/hr_timesheet_project_process.xml"],
+ "update_xml" : ["hr_timesheet_project_view.xml",
+ "process/hr_timesheet_project_process.xml",
+ ],
"active": False,
"installable": True
}
diff --git a/addons/hr_timesheet_project/i18n/fr_FR.po b/addons/hr_timesheet_project/i18n/fr_FR.po
index 902bf0ae07c..f483483c7f5 100644
--- a/addons/hr_timesheet_project/i18n/fr_FR.po
+++ b/addons/hr_timesheet_project/i18n/fr_FR.po
@@ -4,24 +4,24 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:42+0000"
-"PO-Revision-Date: 2008-09-11 15:41:42+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 16:09+0000\n"
+"PO-Revision-Date: 2008-10-13 12:02+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-14 12:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet_project
#: model:ir.actions.wizard,name:hr_timesheet_project.encode_hour_tss
msgid "Import Hours From Tasks"
-msgstr ""
+msgstr "Importer les Heures des Tâches"
#. module: hr_timesheet_project
#: model:ir.ui.menu,name:hr_timesheet_project.menu_act_hr_timesheet_line_me_today_project_form
msgid "Hours From Tasks"
-msgstr ""
-
+msgstr "Heures des Tâches"
diff --git a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml
index d514b14bf17..0cc7032602d 100644
--- a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml
+++ b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml
@@ -58,7 +58,7 @@
-
+
diff --git a/addons/hr_timesheet_sheet/i18n/fr_FR.po b/addons/hr_timesheet_sheet/i18n/fr_FR.po
index d95a163341f..9b5c9328e75 100644
--- a/addons/hr_timesheet_sheet/i18n/fr_FR.po
+++ b/addons/hr_timesheet_sheet/i18n/fr_FR.po
@@ -4,21 +4,24 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 16:25+0000\n"
+"PO-Revision-Date: 2008-10-13 12:10+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-13 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+#~ msgid "Configuration"
+#~ msgstr "Configuration"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet.account:0
msgid "Timesheet by Accounts"
-msgstr ""
+msgstr "Feuille de Feuilles de Présence"
#. module: hr_timesheet_sheet
#: selection:hr_timesheet_sheet.sheet,state:0
@@ -32,8 +35,11 @@ msgstr "Présence"
#. module: hr_timesheet_sheet
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
@@ -66,13 +72,7 @@ msgstr "Feuilles de présence non-validées"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet.day:0
msgid "Timesheet by Days"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#, python-format
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
-msgid "You can not sign out from an other date than today"
-msgstr ""
+msgstr "Feuille de Feuilles de Présence"
#. module: hr_timesheet_sheet
#: selection:hr_timesheet_sheet.sheet,state:0
@@ -80,10 +80,8 @@ msgid "Draft"
msgstr "Brouillon"
#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
#: view:hr_timesheet_sheet.sheet:0
msgid "Timesheets"
msgstr "Timesheets"
@@ -92,7 +90,7 @@ msgstr "Timesheets"
#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
msgid "Timesheets To Confirm"
-msgstr ""
+msgstr "Feuille de Feuilles de Présence"
#. module: hr_timesheet_sheet
#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
@@ -106,7 +104,7 @@ msgstr "Mes feuilles de présence à confirmer"
#: field:hr_timesheet_sheet.sheet.account,sheet_id:0
#: field:hr_timesheet_sheet.sheet.day,sheet_id:0
msgid "Sheet"
-msgstr "Feuille "
+msgstr "Feuille"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
@@ -126,13 +124,7 @@ msgstr "Aujourd'hui"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet,state:0
msgid "Status"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#, python-format
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
-msgid "Please verify that the total difference of the sheet is lower than %.2f !"
-msgstr ""
+msgstr "État"
#. module: hr_timesheet_sheet
#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_attendance
@@ -142,11 +134,9 @@ msgid "Attendances"
msgstr "Présences"
#. module: hr_timesheet_sheet
-#, python-format
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
-#: code:addons/hr_timesheet_sheet/wizard/wizard_timesheet_current.py:0
-msgid "Error !"
-msgstr ""
+#: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
+msgid "Invoice rate"
+msgstr "Taux de facturation"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet,name:0
@@ -166,18 +156,12 @@ msgstr "Accepter"
#. module: hr_timesheet_sheet
#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
msgid "Timesheet Lines"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#, python-format
-#: code:addons/hr_timesheet_sheet/wizard/wizard_timesheet_current.py:0
-msgid "No employee defined for your user !"
-msgstr ""
+msgstr "Lignes des Feuilles de Présence"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet,state_attendance:0
msgid "Current Status"
-msgstr ""
+msgstr "État actuel"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
@@ -192,17 +176,17 @@ msgstr "Semaine"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet,date_to:0
msgid "Date to"
-msgstr "Date de "
+msgstr "Date de"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet,user_id:0
msgid "User"
-msgstr "Utilisateur "
+msgstr "Utilisateur"
#. module: hr_timesheet_sheet
#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
msgid "Timesheet by Account"
-msgstr ""
+msgstr "Feuilles de Présence par Compte"
#. module: hr_timesheet_sheet
#: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -218,7 +202,7 @@ msgstr "Date"
#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
msgid "My Current Timesheet"
-msgstr ""
+msgstr "Ma Feuille de Présence actuelle"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet.day,total_difference:0
@@ -240,7 +224,7 @@ msgstr "Présent"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet,date_from:0
msgid "Date from"
-msgstr "Date de "
+msgstr "Date de"
#. module: hr_timesheet_sheet
#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
@@ -255,39 +239,22 @@ msgstr "Absent"
#. module: hr_timesheet_sheet
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#, python-format
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
-msgid "UserError"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue!"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
msgid "Daily View"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
+msgstr "Vue Journalière"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
msgid "By Day"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#, python-format
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
-msgid "You can not sign in from an other date than today"
-msgstr ""
+msgstr "Par Jour"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet.day:0
msgid "Total Difference"
-msgstr ""
+msgstr "Différence Totale"
#. module: hr_timesheet_sheet
#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
@@ -296,26 +263,16 @@ msgid "Timesheets by period"
msgstr "Feuilles de présence par période"
#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Go to:"
-msgstr "Aller à :"
-
-#. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
-msgid "Invoice rate"
-msgstr "Taux de facturation"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
+msgid "Timesheets To Validate"
+msgstr "Feuilles de Présence à Valider"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
msgid "Sign In"
msgstr "Pointer l'entrée"
-#. module: hr_timesheet_sheet
-#, python-format
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
-msgid "You can not modify an entry in a confirmed timesheet !"
-msgstr ""
-
#. module: hr_timesheet_sheet
#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
@@ -326,12 +283,6 @@ msgstr ""
msgid "My department's timesheet"
msgstr "Les feuilles de présence de mon département"
-#. module: hr_timesheet_sheet
-#, python-format
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
-msgid "Warning !"
-msgstr ""
-
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet.account:0
msgid "Timesheet by accounts"
@@ -339,8 +290,12 @@ msgstr "Feuille de présence par compte"
#. module: hr_timesheet_sheet
#: help:res.company,timesheet_max_difference:0
-msgid "Allowed difference between the sign in/out and the timesheet computation for one sheet. Set this to 0 if you do not want any control."
-msgstr "La différence permise entre le sign in/out and le calcul de la timesheet pour une feuille. Mettez cette valeur à 0 si vous ne voulez aucun contrôle."
+msgid ""
+"Allowed difference between the sign in/out and the timesheet computation for "
+"one sheet. Set this to 0 if you do not want any control."
+msgstr ""
+"La différence permise entre le sign in/out and le calcul de la timesheet "
+"pour une feuille. Mettez cette valeur à 0 si vous ne voulez aucun contrôle."
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -348,9 +303,9 @@ msgid "Analytic accounts"
msgstr "Compte analytique"
#. module: hr_timesheet_sheet
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Configuration"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Go to:"
+msgstr "Aller à :"
#. module: hr_timesheet_sheet
#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
@@ -384,7 +339,7 @@ msgstr "Période"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
msgid "Timesheet"
-msgstr "Feuille de présence "
+msgstr "Feuille de présence"
#. module: hr_timesheet_sheet
#: selection:res.company,timesheet_range:0
@@ -411,12 +366,6 @@ msgstr "Fait"
msgid "Current date"
msgstr "Date actuelle"
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
-msgstr ""
-
#. module: hr_timesheet_sheet
#: selection:res.company,timesheet_range:0
msgid "Year"
@@ -425,10 +374,9 @@ msgstr "Année"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet.account:0
msgid "Total"
-msgstr ""
+msgstr "Total"
#. module: hr_timesheet_sheet
#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
msgid "Timesheet by Day"
-msgstr ""
-
+msgstr "Feuilles de Présence par Jour"
diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
index 24374c2a810..6917812bedb 100644
--- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
+++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
@@ -89,6 +89,7 @@
+
@@ -140,6 +141,14 @@
+
+
+
+
+
+
+
+
@@ -166,6 +175,7 @@
+
@@ -222,5 +232,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index be9d927f9a4..5b7cf40a379 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -1,4 +1,4 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_hr_timesheet_sheet_sheet,hr_timesheet_sheet.sheet,model_hr_timesheet_sheet_sheet,base.group_user,1,1,1,1
-access_hr_timesheet_sheet_sheet_day,hr_timesheet_sheet.sheet.day,model_hr_timesheet_sheet_sheet_day,base.group_user,1,1,1,1
-access_hr_timesheet_sheet_sheet_account,hr_timesheet_sheet.sheet.account,model_hr_timesheet_sheet_sheet_account,base.group_user,1,1,1,1
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_hr_timesheet_sheet_sheet","hr_timesheet_sheet.sheet","model_hr_timesheet_sheet_sheet","hr.group_hr_user",1,1,1,1
+"access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","hr.group_hr_user",1,1,1,1
+"access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","hr.group_hr_user",1,1,1,1
diff --git a/addons/idea/i18n/fr_FR.po b/addons/idea/i18n/fr_FR.po
index adca5caadee..78245fbe6c0 100644
--- a/addons/idea/i18n/fr_FR.po
+++ b/addons/idea/i18n/fr_FR.po
@@ -4,65 +4,69 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:42+0000"
-"PO-Revision-Date: 2008-09-11 15:41:42+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 16:29+0000\n"
+"PO-Revision-Date: 2008-10-13 16:48+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-13 17:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: idea
#: field:idea.category,name:0
#: field:idea.idea,category_id:0
msgid "Category"
-msgstr ""
+msgstr "Catégorie"
#. module: idea
#: selection:idea.idea,my_vote:0
#: selection:idea.vote,score:0
#: selection:idea.vote.stat,score:0
msgid "Very Good"
-msgstr ""
+msgstr "Très bien"
#. module: idea
#: field:idea.idea,stat_vote_ids:0
#: view:idea.idea:0
msgid "Statistics"
-msgstr ""
+msgstr "Statistiques"
#. module: idea
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: idea
#: selection:idea.idea,state:0
msgid "Opened"
-msgstr ""
+msgstr "Ouvert"
#. module: idea
#: selection:idea.idea,my_vote:0
#: selection:idea.vote,score:0
#: selection:idea.vote.stat,score:0
msgid "Not Voted"
-msgstr ""
+msgstr "Pas de vote"
#. module: idea
#: model:ir.actions.act_window,name:idea.action_idea_idea_open_my
#: model:ir.ui.menu,name:idea.menu_idea_idea_open_my
msgid "My Open Ideas"
-msgstr ""
+msgstr "Mes Idées Ouvertes"
#. module: idea
#: model:ir.actions.act_window,name:idea.action_idea_idea
#: model:ir.ui.menu,name:idea.menu_ideas
#: model:ir.ui.menu,name:idea.menu_ideas1
msgid "Ideas"
-msgstr ""
+msgstr "Idées"
#. module: idea
#: model:ir.model,name:idea.model_idea_comment
@@ -70,82 +74,82 @@ msgstr ""
#: view:idea.comment:0
#: view:idea.idea:0
msgid "Comments"
-msgstr ""
+msgstr "Commentaires"
#. module: idea
#: selection:idea.idea,my_vote:0
#: selection:idea.vote,score:0
#: selection:idea.vote.stat,score:0
msgid "Very Bad"
-msgstr ""
+msgstr "Très mauvais"
#. module: idea
#: selection:idea.idea,my_vote:0
#: selection:idea.vote,score:0
#: selection:idea.vote.stat,score:0
msgid "Bad"
-msgstr ""
+msgstr "Mauvais"
#. module: idea
#: model:ir.actions.act_window,name:idea.action_idea_category_tree
#: model:ir.ui.menu,name:idea.menu_idea_category_tree
msgid "Ideas by Categories"
-msgstr ""
+msgstr "Idées par Catégorie"
#. module: idea
#: field:idea.vote,score:0
#: field:idea.vote.stat,score:0
msgid "Score"
-msgstr ""
+msgstr "Score"
#. module: idea
#: selection:idea.idea,state:0
msgid "Draft"
-msgstr ""
+msgstr "Brouillon"
#. module: idea
#: model:ir.actions.act_window,name:idea.action_idea_vote
msgid "Idea's vote"
-msgstr ""
+msgstr "Vote de l'Idée"
#. module: idea
#: model:ir.actions.act_window,name:idea.action_idea_vote_stat
msgid "Statistics on Votes"
-msgstr ""
+msgstr "Statistiques sur les Votes"
#. module: idea
#: model:ir.model,name:idea.model_idea_category
msgid "Category for an idea"
-msgstr ""
+msgstr "Catégorie d'une Idée"
#. module: idea
#: view:idea.category:0
msgid "Category of ideas"
-msgstr ""
+msgstr "Catégories d'Idée"
#. module: idea
#: field:idea.idea,state:0
msgid "Status"
-msgstr ""
+msgstr "État"
#. module: idea
#: selection:idea.idea,my_vote:0
#: selection:idea.vote,score:0
#: selection:idea.vote.stat,score:0
msgid "Good"
-msgstr ""
+msgstr "Bon"
#. module: idea
#: field:idea.idea,description:0
msgid "Description"
-msgstr ""
+msgstr "Description"
#. module: idea
#: selection:idea.idea,my_vote:0
#: selection:idea.vote,score:0
#: selection:idea.vote.stat,score:0
msgid "Normal"
-msgstr ""
+msgstr "Normal"
#. module: idea
#: model:ir.ui.menu,name:idea.menu_reporting
@@ -155,12 +159,12 @@ msgstr "Reporting"
#. module: idea
#: view:idea.idea:0
msgid "Close"
-msgstr ""
+msgstr "Fermer"
#. module: idea
#: model:ir.model,name:idea.model_idea_vote_stat
msgid "Idea Votes Statistics"
-msgstr ""
+msgstr "Statistiques des Votes d'Idée"
#. module: idea
#: model:ir.model,name:idea.model_idea_vote
@@ -171,17 +175,17 @@ msgstr ""
#: field:idea.comment,user_id:0
#: field:idea.vote,user_id:0
msgid "User"
-msgstr ""
+msgstr "Utilisateur"
#. module: idea
#: view:idea.idea:0
msgid "Your comment"
-msgstr ""
+msgstr "Votre commentaire"
#. module: idea
#: selection:idea.idea,state:0
msgid "Accepted"
-msgstr ""
+msgstr "Accepté"
#. module: idea
#: model:ir.ui.menu,name:idea.menu_idea_category
@@ -196,23 +200,23 @@ msgstr ""
#. module: idea
#: field:idea.idea,my_vote:0
msgid "My Vote"
-msgstr ""
+msgstr "Mes Votes"
#. module: idea
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue"
#. module: idea
#: view:idea.vote:0
msgid "Votes"
-msgstr ""
+msgstr "Votes"
#. module: idea
#: field:idea.comment,create_date:0
#: field:idea.idea,create_date:0
msgid "Creation date"
-msgstr ""
+msgstr "Date de création"
#. module: idea
#: field:idea.idea,count_votes:0
@@ -222,7 +226,7 @@ msgstr ""
#. module: idea
#: field:idea.vote.stat,nbr:0
msgid "Number of Votes"
-msgstr ""
+msgstr "Nombre de Votes"
#. module: idea
#: model:ir.model,name:idea.model_idea_idea
@@ -232,29 +236,29 @@ msgstr ""
#. module: idea
#: field:idea.category,summary:0
msgid "Summary"
-msgstr ""
+msgstr "Résumé"
#. module: idea
#: view:idea.idea:0
msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
#. module: idea
#: model:ir.actions.act_window,name:idea.action_idea_idea_my_idea
#: model:ir.ui.menu,name:idea.menu_idea_idea_my_idea
msgid "My Ideas"
-msgstr ""
+msgstr "Mes Idées"
#. module: idea
#: model:ir.ui.menu,name:idea.menu_idea_idea
#: view:idea.idea:0
msgid "All Ideas"
-msgstr ""
+msgstr "Toutes les Idées"
#. module: idea
#: field:idea.category,child_ids:0
msgid "Child Categories"
-msgstr ""
+msgstr "Catégories filles"
#. module: idea
#: field:idea.idea,count_comments:0
@@ -264,22 +268,22 @@ msgstr ""
#. module: idea
#: field:idea.idea,title:0
msgid "Idea Summary"
-msgstr ""
+msgstr "Résumé de l'Idée"
#. module: idea
#: model:ir.ui.menu,name:idea.menu_idea_vote_stat
msgid "Vote Statistics"
-msgstr ""
+msgstr "Statistiques des Votes"
#. module: idea
#: view:idea.idea:0
msgid "New Idea"
-msgstr ""
+msgstr "Nouvelle Idée"
#. module: idea
#: field:idea.idea,vote_avg:0
msgid "Average Score"
-msgstr ""
+msgstr "Moyenne des scores"
#. module: idea
#: view:idea.idea:0
@@ -292,7 +296,7 @@ msgstr ""
#: view:idea.comment:0
#: view:idea.idea:0
msgid "Comment"
-msgstr ""
+msgstr "Commentaire"
#. module: idea
#: model:ir.ui.menu,name:idea.menu_config
@@ -302,17 +306,17 @@ msgstr "Configuration"
#. module: idea
#: field:idea.category,parent_id:0
msgid "Parent Categories"
-msgstr ""
+msgstr "Catégorie Parente"
#. module: idea
#: field:idea.idea,user_id:0
msgid "Creator"
-msgstr ""
+msgstr "Créateur"
#. module: idea
#: view:idea.idea:0
msgid "Open"
-msgstr ""
+msgstr "Ouvert"
#. module: idea
#: field:idea.comment,idea_id:0
@@ -320,43 +324,42 @@ msgstr ""
#: field:idea.vote.stat,idea_id:0
#: view:idea.idea:0
msgid "Idea"
-msgstr ""
+msgstr "Idée"
#. module: idea
#: selection:idea.idea,state:0
msgid "Canceled"
-msgstr ""
+msgstr "Annulée"
#. module: idea
#: model:ir.ui.menu,name:idea.menu_idea_vote
msgid "All Votes"
-msgstr ""
+msgstr "Tous les Votes"
#. module: idea
#: field:idea.idea,vote_ids:0
msgid "Vote"
-msgstr ""
+msgstr "Vote"
#. module: idea
#: model:ir.actions.act_window,name:idea.action_idea_idea_draft_my
#: model:ir.ui.menu,name:idea.menu_idea_idea_draft_my
msgid "My Draft Ideas"
-msgstr ""
+msgstr "Mes Idées Brouillon"
#. module: idea
#: model:ir.actions.act_window,name:idea.action_idea_idea_categ_open
#: model:ir.actions.act_window,name:idea.action_idea_idea_open
#: model:ir.ui.menu,name:idea.menu_idea_idea_open
msgid "Open Ideas"
-msgstr ""
+msgstr "Idées Ouvertes"
#. module: idea
#: model:ir.ui.menu,name:idea.menu_tools
msgid "Tools"
-msgstr ""
+msgstr "Outils"
#. module: idea
#: help:idea.idea,description:0
msgid "Content of the idea"
-msgstr ""
-
+msgstr "Contenu de l'Idée"
diff --git a/addons/l10n_be/account.report.report.csv b/addons/l10n_be/account.report.report.csv
index 0ae4993b5de..8bf965c741c 100644
--- a/addons/l10n_be/account.report.report.csv
+++ b/addons/l10n_be/account.report.report.csv
@@ -1,21 +1,21 @@
-expression,note,parent_id,sequence,expression_status,style,type,code,name
-0,,,,0,1,indicator,BILAN,Bilan
-"report('BIMMO','BSTOCK','BREAL','BDISPO')",,BILAN,,0,2,fiscal,Actif,Actif
-balance('2'),,Actif,,0,3,indicator,BIMMO,Valeurs immobilisées
-balance('3'),,Actif,2,0,3,indicator,BSTOCK,Stocks
-balance('4'),,Actif,3,0,3,indicator,BREAL,Réalisable
-balance('5'),,Actif,4,0,3,fiscal,BDISPO,Disponible
-report('BCAP') + report('BRESNET'),,BILAN,1,0,2,fiscal,PASSIF,Passif
-balance('1'),,PASSIF,1,0,5,indicator,BCAP,Capitaux propores
--balance('7')+balance('6'),,PASSIF,,0,3,fiscal,BRESNET,Résultat net
-0,,,,0,1,fiscal,CRES,Compte des résultats
-"report('CCHAR','CBENEF')",,CRES,,0,2,fiscal,CRESACTIF,Résultat Actif
-balance('6'),,CRESACTIF,,0,2,fiscal,CCHAR,Total des charges
-report('CRESPROD'),,CRES,,0,2,fiscal,CRESPASSIF,Résultat Passif
--balance('7'),,CRESPASSIF,,0,2,fiscal,CRESPROD,Total des produits
--balance('7')+balance('6'),,CRESACTIF,,0,2,fiscal,CBENEF,Résultat (Bénéfice)
-0,,,,0,3,indicator,IIMMO,Immobilisations
-"balance('1')/balance(map(str(range(21,29))))","Dans une entreprise normalement équilibrée, les valeurs immobilisées sont couvertes en premier lieu par les capitaux propres et, en second lieu, par tout ou partie du passif à long terme. Idéalement, ce ratio (rapport entre capitaux permanents et les valeurs immobilisées) doit être suppérieur à l'unité.",IIMMO,,"balance('1')/balance(map(str(range(21,29)))) - 1",3,indicator,CIMMO,Couverture des immobilisations
-0,,,,0,2,indicator,ITRE,Trésorerie
-"balance('3','4','5') / balance('101','13','15','16','17','18')",Détermine si l'entreprise a la possibilité de s'acquitter de ses dettes à court terme dans des conditions normales. Calculé comme suit: (Stocks + Réalisable + Disponible ) / Passif exigible à court terme,ITRE,,"balance('3','4','5') / balance('101','13','15','16','17','18')",3,indicator,IFR,Indice du fond de roulement
-"balance('4','5') / balance('101','13','15','16','17','18')",,ITRE,,"balance('4','5') / balance('101','13','15','16','17','18')",5,indicator,RTRE,Ratio de trésorerie
+"expression","note","parent_id","sequence","badness_limit","goodness_limit","type","code","name"
+0,,,,0,1,"indicator","BILAN","Bilan"
+"report('BIMMO','BSTOCK','BREAL','BDISPO')",,"BILAN",,0,1,"fiscal","Actif","Actif"
+"balance('2')",,"Actif",,0,1,"indicator","BIMMO","Valeurs immobilisées"
+"balance('3')",,"Actif",2,0,1,"indicator","BSTOCK","Stocks"
+"balance('4')",,"Actif",3,0,1,"indicator","BREAL","Réalisable"
+"balance('5')",,"Actif",4,0,1,"fiscal","BDISPO","Disponible"
+"report('BCAP') + report('BRESNET')",,"BILAN",1,0,1,"fiscal","PASSIF","Passif"
+"balance('1')",,"PASSIF",1,0,1,"indicator","BCAP","Capitaux propores"
+"-balance('7')+balance('6')",,"PASSIF",,0,1,"fiscal","BRESNET","Résultat net"
+0,,,,0,1,"fiscal","CRES","Compte des résultats"
+"report('CCHAR','CBENEF')",,"CRES",,0,1,"fiscal","CRESACTIF","Résultat Actif"
+"balance('6')",,"CRESACTIF",,0,1,"fiscal","CCHAR","Total des charges"
+"report('CRESPROD')",,"CRES",,0,1,"fiscal","CRESPASSIF","Résultat Passif"
+"-balance('7')",,"CRESPASSIF",,0,1,"fiscal","CRESPROD","Total des produits"
+"-balance('7')+balance('6')",,"CRESACTIF",,0,1,"fiscal","CBENEF","Résultat (Bénéfice)"
+0,,,,0,1,"indicator","IIMMO","Immobilisations"
+"balance('1')/balance(map(str(range(21,29))))","Dans une entreprise normalement équilibrée, les valeurs immobilisées sont couvertes en premier lieu par les capitaux propres et, en second lieu, par tout ou partie du passif à long terme. Idéalement, ce ratio (rapport entre capitaux permanents et les valeurs immobilisées) doit être suppérieur à l'unité.","IIMMO",,0,1,"indicator","CIMMO","Couverture des immobilisations"
+0,,,,0,1,"indicator","ITRE","Trésorerie"
+"balance('3','4','5') / balance('101','13','15','16','17','18')","Détermine si l'entreprise a la possibilité de s'acquitter de ses dettes à court terme dans des conditions normales. Calculé comme suit: (Stocks + Réalisable + Disponible ) / Passif exigible à court terme","ITRE",,0,1,"indicator","IFR","Indice du fond de roulement"
+"balance('4','5') / balance('101','13','15','16','17','18')",,"ITRE",,0,1,"indicator","RTRE","Ratio de trésorerie"
diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml
index d7252313333..1951975d618 100644
--- a/addons/l10n_be/account_pcmn_belgium.xml
+++ b/addons/l10n_be/account_pcmn_belgium.xml
@@ -59,7 +59,6 @@
none
-
@@ -6434,7 +6433,7 @@
- Plan de Taxe Belge
+ Plan de Taxes Belge
I. Valeur des operations
diff --git a/addons/l10n_be/i18n/fr_FR.po b/addons/l10n_be/i18n/fr_FR.po
index e5438c16365..4968f890d53 100644
--- a/addons/l10n_be/i18n/fr_FR.po
+++ b/addons/l10n_be/i18n/fr_FR.po
@@ -4,79 +4,24 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 16:24+0000\n"
+"PO-Revision-Date: 2008-10-13 12:11+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-13 12:44+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_produit
-msgid "Produit"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_tiers
-msgid "Tiers"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_stock
-msgid "Stock et Encours"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_immo
-msgid "Immobilisation"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_tax
-msgid "Tax"
-msgstr "Impôts et taxes"
+#: constraint:account.tax.code:0
+msgid "Error ! You can not create recursive accounts."
+msgstr "Erreur! Vous ne pouvez pas créer de comptes récursifs."
#. module: l10n_be
#: model:ir.ui.menu,name:l10n_be.account_wizard_vat_declaration
msgid "VAT Declaration"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_tiers_receiv
-msgid "Tiers - Recevable"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_charge
-msgid "Charge"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_financiers
-msgid "Financier"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_capitaux
-msgid "Capital"
-msgstr ""
-
-#. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_tiers_payable
-msgid "Tiers - Payable"
-msgstr ""
-
+msgstr "Déclaration TVA"
diff --git a/addons/l10n_chart_uk_minimal/i18n/fr_FR.po b/addons/l10n_chart_uk_minimal/i18n/fr_FR.po
index 37b4a250448..e363fa287cd 100644
--- a/addons/l10n_chart_uk_minimal/i18n/fr_FR.po
+++ b/addons/l10n_chart_uk_minimal/i18n/fr_FR.po
@@ -4,19 +4,19 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@tinyerp.com"
-"POT-Creation-Date: 2008-09-04 08:35:53+0000"
-"PO-Revision-Date: 2008-09-04 08:35:53+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 16:31+0000\n"
+"PO-Revision-Date: 2008-10-14 13:30+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-14 14:00+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_chart_uk_minimal
#: constraint:account.tax.code:0
msgid "Error ! You can not create recursive accounts."
-msgstr ""
-
+msgstr "Erreur! Vous ne pouvez pas créer de comptes récursifs."
diff --git a/addons/l10n_fr/i18n/fr_FR.po b/addons/l10n_fr/i18n/fr_FR.po
index cb1f7eaaa9c..9124295c3a5 100644
--- a/addons/l10n_fr/i18n/fr_FR.po
+++ b/addons/l10n_fr/i18n/fr_FR.po
@@ -4,32 +4,33 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@tinyerp.com"
-"POT-Creation-Date: 2008-09-04 08:35:53+0000"
-"PO-Revision-Date: 2008-09-04 08:35:53+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 13:45+0000\n"
+"PO-Revision-Date: 2008-10-14 13:30+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-14 13:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_fr
#: model:account.account.type,name:l10n_fr.account_type_dettes
msgid "dettes long terme"
-msgstr ""
+msgstr "dettes long terme"
#. module: l10n_fr
#: model:ir.actions.wizard,name:l10n_fr.wizard_chart_report
#: model:ir.ui.menu,name:l10n_fr.menu_fr_chart_report
msgid "Account Report"
-msgstr ""
+msgstr "Rapport de compte"
#. module: l10n_fr
#: wizard_field:account.chart.report,init,company_id:0
msgid "Company"
-msgstr ""
+msgstr "Société"
#. module: l10n_fr
#: wizard_button:account.chart.report,init,pdf:0
@@ -39,45 +40,44 @@ msgstr ""
#. module: l10n_fr
#: wizard_field:account.chart.report,init,fiscalyear:0
msgid "Fiscal year"
-msgstr ""
+msgstr "Année fiscale"
#. module: l10n_fr
#: model:account.account.type,name:l10n_fr.account_type_immobilisations
msgid "immobilisations"
-msgstr ""
+msgstr "immobilisations"
#. module: l10n_fr
#: wizard_view:account.chart.report,init:0
msgid "Aged Trial Balance"
-msgstr ""
+msgstr "Echéancier"
#. module: l10n_fr
#: model:account.journal,name:l10n_fr.operations_journal
msgid "Journal des opérations diverses"
-msgstr ""
+msgstr "Journal des opérations diverses"
#. module: l10n_fr
#: model:account.journal,name:l10n_fr.bilan_journal
msgid "Journal d'ouverture"
-msgstr ""
+msgstr "Journal d'ouverture"
#. module: l10n_fr
#: wizard_button:account.chart.report,init,end:0
msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
#. module: l10n_fr
#: model:account.account.type,name:l10n_fr.account_type_cloture
msgid "Cloture"
-msgstr ""
+msgstr "Cloture"
#. module: l10n_fr
#: model:account.account.type,name:l10n_fr.account_type_stocks
msgid "stocks"
-msgstr ""
+msgstr "stocks"
#. module: l10n_fr
#: wizard_field:account.chart.report,init,target_move:0
msgid "Target Moves"
-msgstr ""
-
+msgstr "Mouvements Cibles"
diff --git a/addons/l10n_lu/__init__.py b/addons/l10n_lu/__init__.py
new file mode 100644
index 00000000000..c185005c878
--- /dev/null
+++ b/addons/l10n_lu/__init__.py
@@ -0,0 +1,4 @@
+#
+# Generated by the Tiny ERP module recorder !
+#
+import wizard
diff --git a/addons/l10n_lu/__terp__.py b/addons/l10n_lu/__terp__.py
new file mode 100644
index 00000000000..49761b3fdb5
--- /dev/null
+++ b/addons/l10n_lu/__terp__.py
@@ -0,0 +1,24 @@
+{
+ "name" : "Luxembourg - Plan Comptable Minimum Normalise",
+ "version" : "1.0",
+ "author" : "Tiny",
+ "website" : "http://openerp.com",
+ "category" : "Localisation/Account Charts",
+ "description": """
+This module install:
+
+ *the KLUWER Chart of Accounts,
+ *the Tax Code Chart for Luxembourg
+ *the main taxes used in Luxembourg""",
+ "depends" : ["account","account_report","base_vat","base_iban"],
+ "init_xml" : [ ],
+ "demo_xml" : ["account.report.report.csv"],
+ "update_xml" : [
+ "account.tax.code.template.csv",
+ "l10n_lu_data.xml",
+ "account.tax.template.csv",
+ "l10n_lu_wizard.xml",
+ "l10n_lu_report.xml",
+ ],
+ "installable": True
+}
diff --git a/addons/l10n_lu/account.report.report.csv b/addons/l10n_lu/account.report.report.csv
new file mode 100644
index 00000000000..8bf965c741c
--- /dev/null
+++ b/addons/l10n_lu/account.report.report.csv
@@ -0,0 +1,21 @@
+"expression","note","parent_id","sequence","badness_limit","goodness_limit","type","code","name"
+0,,,,0,1,"indicator","BILAN","Bilan"
+"report('BIMMO','BSTOCK','BREAL','BDISPO')",,"BILAN",,0,1,"fiscal","Actif","Actif"
+"balance('2')",,"Actif",,0,1,"indicator","BIMMO","Valeurs immobilisées"
+"balance('3')",,"Actif",2,0,1,"indicator","BSTOCK","Stocks"
+"balance('4')",,"Actif",3,0,1,"indicator","BREAL","Réalisable"
+"balance('5')",,"Actif",4,0,1,"fiscal","BDISPO","Disponible"
+"report('BCAP') + report('BRESNET')",,"BILAN",1,0,1,"fiscal","PASSIF","Passif"
+"balance('1')",,"PASSIF",1,0,1,"indicator","BCAP","Capitaux propores"
+"-balance('7')+balance('6')",,"PASSIF",,0,1,"fiscal","BRESNET","Résultat net"
+0,,,,0,1,"fiscal","CRES","Compte des résultats"
+"report('CCHAR','CBENEF')",,"CRES",,0,1,"fiscal","CRESACTIF","Résultat Actif"
+"balance('6')",,"CRESACTIF",,0,1,"fiscal","CCHAR","Total des charges"
+"report('CRESPROD')",,"CRES",,0,1,"fiscal","CRESPASSIF","Résultat Passif"
+"-balance('7')",,"CRESPASSIF",,0,1,"fiscal","CRESPROD","Total des produits"
+"-balance('7')+balance('6')",,"CRESACTIF",,0,1,"fiscal","CBENEF","Résultat (Bénéfice)"
+0,,,,0,1,"indicator","IIMMO","Immobilisations"
+"balance('1')/balance(map(str(range(21,29))))","Dans une entreprise normalement équilibrée, les valeurs immobilisées sont couvertes en premier lieu par les capitaux propres et, en second lieu, par tout ou partie du passif à long terme. Idéalement, ce ratio (rapport entre capitaux permanents et les valeurs immobilisées) doit être suppérieur à l'unité.","IIMMO",,0,1,"indicator","CIMMO","Couverture des immobilisations"
+0,,,,0,1,"indicator","ITRE","Trésorerie"
+"balance('3','4','5') / balance('101','13','15','16','17','18')","Détermine si l'entreprise a la possibilité de s'acquitter de ses dettes à court terme dans des conditions normales. Calculé comme suit: (Stocks + Réalisable + Disponible ) / Passif exigible à court terme","ITRE",,0,1,"indicator","IFR","Indice du fond de roulement"
+"balance('4','5') / balance('101','13','15','16','17','18')",,"ITRE",,0,1,"indicator","RTRE","Ratio de trésorerie"
diff --git a/addons/l10n_lu/account.tax.code.template.csv b/addons/l10n_lu/account.tax.code.template.csv
new file mode 100644
index 00000000000..eea68172e6c
--- /dev/null
+++ b/addons/l10n_lu/account.tax.code.template.csv
@@ -0,0 +1,90 @@
+"parent_id:id","code","sign","id","name"
+,,1,"account_tax_code_template_1","Plan de Taxes Luxembourgeois"
+"account_tax_code_template_1",76,1,"account_tax_code_template_73","Solde à verser"
+"account_tax_code_template_1",10,-1,"account_tax_code_template_8","Prestations de services (art 26)"
+"account_tax_code_template_1",46,1,"account_tax_code_template_37","Total Base intracommunautaire"
+"account_tax_code_template_1",52,1,"account_tax_code_template_50","Acquisition triangulaire"
+"account_tax_code_template_1",61,1,"account_tax_code_template_63","Total Base Importation"
+"account_tax_code_template_1",74,1,"account_tax_code_template_71","Excédent de taxe"
+"account_tax_code_template_1",9,1,"account_tax_code_template_2","Total du chiffre d'affaires"
+"account_tax_code_template_2",5,1,"account_tax_code_template_5","Prélèvements privés de services (art 16)"
+"account_tax_code_template_2",4,1,"account_tax_code_template_4","Prélèvements privés de biens (art 13 a)"
+"account_tax_code_template_2",8,1,"account_tax_code_template_7","Point 5"
+"account_tax_code_template_2",3,1,"account_tax_code_template_3","1. Ventes ou recettes"
+"account_tax_code_template_2",6,1,"account_tax_code_template_6","Affectation de biens (art 13 b)"
+"account_tax_code_template_3","Exo",1,"account_tax_code_template_90","Total Exoneration"
+"account_tax_code_template_3",22,1,"account_tax_code_template_17","Chiffre d'affaires imposable (sans TVA)"
+"account_tax_code_template_8",422,1,"account_tax_code_template_87","Base des prestations de services (art.26/1/c et d)"
+"account_tax_code_template_8",92,1,"account_tax_code_template_78","Livraisons de biens (art. 26) 6%"
+"account_tax_code_template_17",33,1,"account_tax_code_template_28","Base CA 6%"
+"account_tax_code_template_17",32,1,"account_tax_code_template_27","Base CA 15%"
+"account_tax_code_template_17",82,1,"account_tax_code_template_31","Base CA au taux indéfini"
+"account_tax_code_template_17",35,1,"account_tax_code_template_30","Base CA 12%"
+"account_tax_code_template_17",34,1,"account_tax_code_template_29","Base CA 3%"
+"account_tax_code_template_37",44,1,"account_tax_code_template_40","Base intracom. 3%"
+"account_tax_code_template_37",85,1,"account_tax_code_template_42","Base intracom. exonérée"
+"account_tax_code_template_37",43,1,"account_tax_code_template_39","Base intracom. 6%"
+"account_tax_code_template_37",42,1,"account_tax_code_template_38","Base intracom. 15%"
+"account_tax_code_template_37",45,1,"account_tax_code_template_41","Base intracom. 12%"
+"account_tax_code_template_73",97,1,"account_tax_code_template_82","Taxe livraisons de biens (art. 26) 6%"
+"account_tax_code_template_90",19,1,"account_tax_code_template_16","Point 7"
+"account_tax_code_template_90",17,1,"account_tax_code_template_15","Autres opérations réalisées à l'étranger"
+"account_tax_code_template_90",13,1,"account_tax_code_template_11","Autres exonérations (art 43)"
+"account_tax_code_template_90",14,1,"account_tax_code_template_12","Autres exonérations (art 44)"
+"account_tax_code_template_90",11,1,"account_tax_code_template_9","Livraisons intracommunautaires de biens"
+"account_tax_code_template_90",12,1,"account_tax_code_template_10","Exportations (art 43)"
+"account_tax_code_template_90",15,1,"account_tax_code_template_13","Tabacs fabriqués"
+"account_tax_code_template_90",16,1,"account_tax_code_template_14","Livraisons / aquisitions intracom."
+"account_tax_code_template_71",73,-1,"account_tax_code_template_70","Taxe en amont déductible"
+"account_tax_code_template_71",98,1,"account_tax_code_template_83","Total de la taxe à payer"
+"account_tax_code_template_83",72,1,"account_tax_code_template_69","Total de la taxe"
+"account_tax_code_template_70",31,1,"account_tax_code_template_26","Taxe en amont déductible"
+"account_tax_code_template_26",27,1,"account_tax_code_template_22","Taxe déclarée comme débiteur"
+"account_tax_code_template_26",28,1,"account_tax_code_template_23","Taxe acquittée comme caution solidaire"
+"account_tax_code_template_26",29,-1,"account_tax_code_template_24","Taxe non déductible / op. exonérée"
+"account_tax_code_template_26",30,-1,"account_tax_code_template_25","Taxe non déductible (art 50)"
+"account_tax_code_template_26",23,1,"account_tax_code_template_18","Achat de B. et S. à l'intérieur du pays"
+"account_tax_code_template_26",24,1,"account_tax_code_template_19","Acquisitions intracom. de biens"
+"account_tax_code_template_26",26,1,"account_tax_code_template_21","Affectations de biens"
+"account_tax_code_template_26",25,1,"account_tax_code_template_20","Importations de biens"
+"account_tax_code_template_69",70,1,"account_tax_code_template_59","Total Taxe Importation (entr.)"
+"account_tax_code_template_69",219,1,"account_tax_code_template_88","Taxe des prestations de services (art.26/1/c et d)"
+"account_tax_code_template_69",87,1,"account_tax_code_template_44","Report"
+"account_tax_code_template_44",86,1,"account_tax_code_template_43","A reporter"
+"account_tax_code_template_43",51,1,"account_tax_code_template_49","Total Taxe intracom."
+"account_tax_code_template_49",47,1,"account_tax_code_template_45","Taxe intracom. 15%"
+"account_tax_code_template_49",81,1,"account_tax_code_template_53","Base à un taux exonéré"
+"account_tax_code_template_49",59,1,"account_tax_code_template_62","Base Importation (privées) 3%"
+"account_tax_code_template_49",50,1,"account_tax_code_template_48","Taxe intracom. 12%"
+"account_tax_code_template_49",48,1,"account_tax_code_template_46","taxe intracom. 6%"
+"account_tax_code_template_49",49,1,"account_tax_code_template_47","Taxe intracom. 3%"
+"account_tax_code_template_49",65,1,"account_tax_code_template_58","Taxe Importation (entr.) 12%"
+"account_tax_code_template_69",71,1,"account_tax_code_template_68","Total Taxe Importation (privées)"
+"account_tax_code_template_58",63,1,"account_tax_code_template_84","Taxe importation (entr.) 6%"
+"account_tax_code_template_58",64,1,"account_tax_code_template_57","Taxe Importation (entr.) 3%"
+"account_tax_code_template_58",62,1,"account_tax_code_template_56","Taxe Importation (entr.) 15%"
+"account_tax_code_template_63",58,1,"account_tax_code_template_61","Base Importation (privées) 6%"
+"account_tax_code_template_63",54,1,"account_tax_code_template_52","Base Importation (entr.) 6%"
+"account_tax_code_template_63",57,1,"account_tax_code_template_60","Base Importation (privées) 15%"
+"account_tax_code_template_63",56,1,"account_tax_code_template_55","Base Importation (entr.) 12%"
+"account_tax_code_template_63",55,1,"account_tax_code_template_54","Base Importation (entr.) 3%"
+"account_tax_code_template_63",53,1,"account_tax_code_template_51","Base importation (entr.) 15%"
+"account_tax_code_template_63",60,1,"account_tax_code_template_85","Base importation (privées.) 12%"
+"account_tax_code_template_68",68,1,"account_tax_code_template_66","Taxe Importation (privées) 3%"
+"account_tax_code_template_68",69,1,"account_tax_code_template_67","Taxe Importation (privées) 12%"
+"account_tax_code_template_68",67,1,"account_tax_code_template_65","Taxe Importation (privées) 6%"
+"account_tax_code_template_68",66,1,"account_tax_code_template_64","Taxe Importation (privées) 15%"
+"account_tax_code_template_87",89,1,"account_tax_code_template_75","Prestations de services (art. 26) 6%"
+"account_tax_code_template_87",88,1,"account_tax_code_template_74","Prestations de services (art. 26) 15%"
+"account_tax_code_template_87",91,1,"account_tax_code_template_77","Prestations de services (art. 26) 12%"
+"account_tax_code_template_87",90,1,"account_tax_code_template_76","Prestations de services (art. 26) 3%"
+"account_tax_code_template_88",94,1,"account_tax_code_template_79","Taxe prestations de services (art. 26) 6%"
+"account_tax_code_template_88",93,1,"account_tax_code_template_86","Taxe prestation de services (Art.26) 15%"
+"account_tax_code_template_88",96,1,"account_tax_code_template_81","Taxe prestations de services (art. 26) 12%"
+"account_tax_code_template_88",95,1,"account_tax_code_template_80","Taxe prestations de services (art. 26) 3%"
+"account_tax_code_template_43",41,1,"account_tax_code_template_89",41
+"account_tax_code_template_89",40,1,"account_tax_code_template_35","Taxes CA 12%"
+"account_tax_code_template_89",83,1,"account_tax_code_template_36","Taxe au taux indéfini"
+"account_tax_code_template_89",39,1,"account_tax_code_template_34","Taxe CA 3%"
+"account_tax_code_template_89",37,1,"account_tax_code_template_32","Taxe CA 15%"
+"account_tax_code_template_89",38,1,"account_tax_code_template_33","Taxe CA 6%"
diff --git a/addons/l10n_lu/account.tax.template.csv b/addons/l10n_lu/account.tax.template.csv
new file mode 100644
index 00000000000..93b4aaa28ea
--- /dev/null
+++ b/addons/l10n_lu/account.tax.template.csv
@@ -0,0 +1,35 @@
+"ref_base_code_id:id","ref_base_sign","name","ref_tax_code_id:id","account_collected_id:id","amount","chart_template_id:id","tax_code_id:id","child_depend","include_base_amount","parent_id:id","tax_sign","account_paid_id:id","base_code_id:id","id","ref_tax_sign"
+"account_tax_code_template_9",-1,"Intra Travail à façon 0%",,,"0.0000","l10nlu_chart_template",,0,0,,1,,"account_tax_code_template_9","account_tax_template_1",1
+"account_tax_code_template_9",-1,"Intra Livraison avec installation 0%",,,"0.0000","l10nlu_chart_template",,0,0,,1,,"account_tax_code_template_9","account_tax_template_2",1
+"account_tax_code_template_9",-1,"Intra transfert de biens 0%",,,"0.0000","l10nlu_chart_template",,0,0,,1,,"account_tax_code_template_9","account_tax_template_3",1
+"account_tax_code_template_13",-1,"Vente de tabacs 0%",,,"0.0000","l10nlu_chart_template",,0,0,,1,,"account_tax_code_template_13","account_tax_template_9",1
+"account_tax_code_template_10",-1,"Exportations 0%",,,"0.0000","l10nlu_chart_template",,0,0,,1,,"account_tax_code_template_10","account_tax_template_10",1
+,1,"Achats frais généraux 0%",,,"0.0000","l10nlu_chart_template",,0,0,,1,,,"account_tax_template_11",1
+"account_tax_code_template_29",-1,"Ventes 3%","account_tax_code_template_34","account_451000","0.0300","l10nlu_chart_template","account_tax_code_template_34",0,0,,1,"account_451000","account_tax_code_template_29","account_tax_template_5",-1
+"account_tax_code_template_28",-1,"Ventes 6%","account_tax_code_template_33","account_451000","0.0600","l10nlu_chart_template","account_tax_code_template_33",0,0,,1,"account_451000","account_tax_code_template_28","account_tax_template_6",-1
+"account_tax_code_template_30",-1,"Ventes 12%","account_tax_code_template_35","account_451000","0.1200","l10nlu_chart_template","account_tax_code_template_35",0,0,,1,"account_451000","account_tax_code_template_30","account_tax_template_7",-1
+"account_tax_code_template_27",-1,"Ventes 15%","account_tax_code_template_32","account_451000","0.1500","l10nlu_chart_template","account_tax_code_template_32",0,0,,1,"account_451000","account_tax_code_template_27","account_tax_template_8",-1
+,1,"Achats frais généraux 15%","account_tax_code_template_18","account_411000","0.1500","l10nlu_chart_template","account_tax_code_template_18",0,0,,1,"account_411000",,"account_tax_template_12",-1
+,1,"Achats Intra-Co",,,1,"l10nlu_chart_template",,1,0,,1,,"account_tax_code_template_38","account_tax_template_13",1
+,1,"Achats de Services Art.26",,,1,"l10nlu_chart_template",,1,0,,1,,"account_tax_code_template_38","account_tax_template_18",1
+,1,"Ventes de Services Art.26",,,1,"l10nlu_chart_template",,1,0,,1,,"account_tax_code_template_38","account_tax_template_21",1
+,1,"Livraison de Biens Triangulaire 1",,"account_411500","0.1500","l10nlu_chart_template","account_tax_code_template_45",0,0,,1,"account_411000","account_tax_code_template_38","account_tax_template_26",1
+,1,"Livraisons de biens triangulaire 2",,"account_411000","-0.1500","l10nlu_chart_template","account_tax_code_template_22",0,0,,-1,"account_451000",,"account_tax_template_25",1
+,1,"Importations a des fins de l'entreprise",,,1,"l10nlu_chart_template",,1,0,,1,,"account_tax_code_template_38","account_tax_template_30",1
+,1,"Importations a des fins privées",,,1,"l10nlu_chart_template",,1,0,,1,,"account_tax_code_template_38","account_tax_template_33",1
+,1,"Livraisons de Biens Art.26",,,1,"l10nlu_chart_template",,1,0,,1,,"account_tax_code_template_38","account_tax_template_36",1
+,1,"Livraison de Biens triangulaire",,,1,"l10nlu_chart_template",,1,0,,1,,"account_tax_code_template_38","account_tax_template_24",1
+,1,"Livraisons de biens triangulaire 2",,"account_411000","-0.1500","l10nlu_chart_template","account_tax_code_template_22",0,0,"account_tax_template_24",-1,"account_451000",,"account_tax_template_22",1
+,1,"Livraison de Biens Triangulaire 1",,"account_411500","0.1500","l10nlu_chart_template","account_tax_code_template_45",0,0,"account_tax_template_24",1,"account_411000","account_tax_code_template_38","account_tax_template_23",1
+,1,"Importations Intra-Co2",,"account_451000","-0.1500","l10nlu_chart_template","account_tax_code_template_56",0,0,"account_tax_template_30",-1,"account_411000","account_tax_code_template_51","account_tax_template_28",1
+,1,"Importations Intra-Co 1",,"account_411500","0.1500","l10nlu_chart_template","account_tax_code_template_20",0,0,"account_tax_template_30",1,"account_411000",,"account_tax_template_29",1
+,1,"Importations Fins Privées",,"account_451000","-0.1500","l10nlu_chart_template","account_tax_code_template_64",0,0,"account_tax_template_33",-1,"account_411000","account_tax_code_template_60","account_tax_template_31",1
+,1,"Importations Fins Privées",,"account_411500","0.1500","l10nlu_chart_template","account_tax_code_template_20",0,0,"account_tax_template_33",1,"account_411000",,"account_tax_template_32",1
+,1,"Livraison de Biens Art26",,"account_411000","-0.1500","l10nlu_chart_template","account_tax_code_template_22",0,0,"account_tax_template_36",-1,"account_451000",,"account_tax_template_34",1
+,1,"Livraisons de Biens Art26",,"account_411500","0.1500","l10nlu_chart_template","account_tax_code_template_82",0,0,"account_tax_template_36",1,"account_411000","account_tax_code_template_78","account_tax_template_35",1
+,1,"Achats Intra-Co 1",,"account_411500","0.1500","l10nlu_chart_template","account_tax_code_template_19",0,0,"account_tax_template_13",1,"account_411000","account_tax_code_template_38","account_tax_template_14",1
+,1,"Achats Intra-CO2",,"account_451000","-0.1500","l10nlu_chart_template","account_tax_code_template_45",0,0,"account_tax_template_13",-1,"account_411000",,"account_tax_template_15",1
+,1,"Services Intra-Co2",,"account_451000","-0.1500","l10nlu_chart_template","account_tax_code_template_45",0,0,"account_tax_template_18",-1,"account_411000",,"account_tax_template_17",1
+,1,"Services Intra-Co 1",,"account_411500","0.1500","l10nlu_chart_template","account_tax_code_template_22",0,0,"account_tax_template_18",1,"account_411000","account_tax_code_template_38","account_tax_template_16",1
+,1,"Services Intra-Co2",,"account_411000","-0.1500","l10nlu_chart_template","account_tax_code_template_22",0,0,"account_tax_template_21",-1,"account_451000",,"account_tax_template_19",1
+,1,"Services Intra-Co 1",,"account_411500","0.1500","l10nlu_chart_template","account_tax_code_template_86",0,0,"account_tax_template_21",1,"account_411000","account_tax_code_template_74","account_tax_template_20",1
diff --git a/addons/l10n_lu/l10n_lu_data.xml b/addons/l10n_lu/l10n_lu_data.xml
new file mode 100644
index 00000000000..ce071ad4cc5
--- /dev/null
+++ b/addons/l10n_lu/l10n_lu_data.xml
@@ -0,0 +1,3784 @@
+
+
+
+
+
+ View
+ view
+ none
+
+
+ Asset
+ asset
+ balance
+
+
+ Liability
+ liability
+ balance
+
+
+ Créances
+ creances
+ balance
+
+
+ Equity
+ equity
+ balance
+
+
+ Income
+ income
+ unreconciled
+
+
+ Expense
+ expense
+ unreconciled
+
+
+ Cash
+ cash
+ balance
+
+
+
+
+
+ 0
+ Plan KLUWER
+ view
+
+
+
+
+ 1
+ Fonds propres, prov. & dettes + d'1an
+
+
+
+ view
+
+
+ 2
+ Immobilis., dettes & créances à + d'1 an
+
+
+
+ view
+
+
+ 3
+ Stocks et commandes en cours d'exécution
+
+
+
+ view
+
+
+ 4
+ Créances et dettes à un an au plus
+
+
+
+ view
+
+
+ 5
+ Placements de trésorerie et disponible
+
+
+
+ view
+
+
+ 6
+ Charges
+
+
+
+ view
+
+
+ 7
+ Produits
+
+
+
+ view
+
+
+ 10
+ Capital
+
+
+
+ view
+
+
+ 12
+ Plus-values de réévaluation
+
+
+
+ view
+
+
+ 13
+ Réserves
+
+
+
+ view
+
+
+ 14
+ Résultat reporté
+
+
+
+ view
+
+
+ 15
+ Subsides en capital
+
+
+
+ view
+
+
+ 16
+ Provisions et impôts différés
+
+
+
+ view
+
+
+ 17
+ Dettes à plus d'un an
+
+
+
+ view
+
+
+ 20
+ Frais d'établissement
+
+
+
+ view
+
+
+ 21
+ Immobilisations incorporelles
+
+
+
+ view
+
+
+ 22
+ Terrains et constructions
+
+
+
+ view
+
+
+ 23
+ Installations, machines et outillages
+
+
+
+ view
+
+
+ 24
+ Mobilier et matériel roulant
+
+
+
+ view
+
+
+ 25
+ Immobilisation détenues en loc.-fin.
+
+
+
+ view
+
+
+ 27
+ Immobilis. corp. en cours & acptes versé
+
+
+
+ view
+
+
+ 28
+ Immobilisations financières
+
+
+
+ view
+
+
+ 30
+ Approvisionnements - matières premières
+
+
+
+ view
+
+
+ 31
+ Approvisionnements et fournitures
+
+
+
+ view
+
+
+ 32
+ En cours de fabrication
+
+
+
+ view
+
+
+ 33
+ Produits finis
+
+
+
+ view
+
+
+ 34
+ Marchandises
+
+
+
+ view
+
+
+ 36
+ Acomptes versés sur achats pour stocks
+
+
+
+ view
+
+
+ 40
+ Créances commerciales
+
+
+
+ view
+
+
+ 41
+ Autres créances à - d'un an
+
+
+
+ view
+
+
+ 42
+ Dettes à + d'1 an échéant dans l'année
+
+
+
+ view
+
+
+ 43
+ Dettes financières
+
+
+
+ view
+
+
+ 44
+ Dettes commerciales
+
+
+
+ view
+
+
+ 45
+ Dettes fiscales, salariales et sociales
+
+
+
+ view
+
+
+ 47
+ Dettes suite à l'affect. des résultats
+
+
+
+ view
+
+
+ 48
+ Dettes diverses
+
+
+
+ view
+
+
+ 49
+ Comptes de régularisation et cptes d'att
+
+
+
+ view
+
+
+ 51
+ Actions et parts
+
+
+
+ view
+
+
+ 52
+ Titres à revenu fixe
+
+
+
+ view
+
+
+ 53
+ Dépôts à terme
+
+
+
+ view
+
+
+ 55
+ Etablissements de crédit
+
+
+
+ view
+
+
+ 56
+ Ccp
+
+
+
+ view
+
+
+ 57
+ Caisses
+
+
+
+ view
+
+
+ 60
+ Approvisionnements et marchandises
+
+
+
+ view
+
+
+ 61
+ Services et biens divers
+
+
+
+ view
+
+
+ 62
+ Rémunérations, charges soc. et pensions
+
+
+
+ view
+
+
+ 64
+ Autres charges d'exploitation
+
+
+
+ view
+
+
+ 65
+ Charges financières
+
+
+
+ view
+
+
+ 66
+ Charges exceptionnelles
+
+
+
+ view
+
+
+ 67
+ Impôts sur le résultat
+
+
+
+ view
+
+
+ 70
+ Chiffre d'affaires
+
+
+
+ view
+
+
+ 71
+ Variation des stocks & comm. en cours
+
+
+
+ view
+
+
+ 74
+ Autres produits d'exploitation
+
+
+
+ view
+
+
+ 75
+ Produits financiers
+
+
+
+ view
+
+
+ 77
+ Régul. d'impôts & reprises prov. fisc.
+
+
+
+ view
+
+
+ 140
+ Bénéfice reporté
+
+
+
+ view
+
+
+ 175
+ Dettes commerciales
+
+
+
+ view
+
+
+ 200
+ Frais de constitution et d'augm. capital
+
+
+
+ view
+
+
+ 201
+ Frais d'augmentation de capital
+
+
+
+ view
+
+
+ 202
+ Fr.d'emission d'empr,prime remboursement
+
+
+
+ view
+
+
+ 203
+ Autres frais d'établissement
+
+
+
+ view
+
+
+ 204
+ Frais de restructuration
+
+
+
+ view
+
+
+ 210
+ Frais de recherche et de développement
+
+
+
+ view
+
+
+ 211
+ Concessions, brevets et licences
+
+
+
+ view
+
+
+ 212
+ Fonds de commerce
+
+
+
+ view
+
+
+ 220
+ Terrains
+
+
+
+ view
+
+
+ 221
+ Constructions
+
+
+
+ view
+
+
+ 222
+ Terrains bâtis
+
+
+
+ view
+
+
+ 223
+ Autres droits réels sur des immeubles
+
+
+
+ view
+
+
+ 230
+ Installations
+
+
+
+ view
+
+
+ 231
+ Machines
+
+
+
+ view
+
+
+ 240
+ Installation gen, agencements,..
+
+
+
+ view
+
+
+ 241
+ Mobilier
+
+
+
+ view
+
+
+ 242
+ Matériel roulant
+
+
+
+ view
+
+
+ 280
+ Participation dans des entreprises liées
+
+
+
+ view
+
+
+ 281
+ Créances sur des entreprises liées
+
+
+
+ view
+
+
+ 282
+ Participations entr. avec lien particip.
+
+
+
+ view
+
+
+ 283
+ Créances / entrepr. avec lien particip.
+
+
+
+ view
+
+
+ 290
+ Créances commerciales
+
+
+
+ view
+
+
+ 291
+ Autres créances
+
+
+
+ view
+
+
+ 411
+ T.v.a en amont
+
+
+
+ view
+
+
+ 425
+ Dettes commerciales échéant ds l'année
+
+
+
+ view
+
+
+ 451
+ T.v.a. en aval
+
+
+
+ view
+
+
+ 452
+ Impôts et taxes à payer
+
+
+
+ view
+
+
+ 512
+ Actions & parts - options acquises
+
+
+
+ view
+
+
+ 550
+ Comptes courants bancaires
+
+
+
+ view
+
+
+ 609
+ Variation des stocks
+
+
+
+ view
+
+
+ 610
+ Loyers et charges locatives
+
+
+
+ view
+
+
+ 612
+ Fournitures faites à l'entreprise
+
+
+
+ view
+
+
+ 613
+ Rétributions de tiers
+
+
+
+ view
+
+
+ 615
+ publicités
+
+
+
+ view
+
+
+ 620
+ Rémunérations et avantages soc. directs
+
+
+
+ view
+
+
+ 621
+ Charges sociales
+
+
+
+ view
+
+
+ 624
+ Pensions
+
+
+
+
+
+ 630
+ Dotations aux corrections de val./immob.
+
+
+
+ view
+
+
+ 631
+ Dotations aux correct. de val./stocks
+
+
+
+ view
+
+
+ 632
+ Dot. cor. val s/en-cours,pr fini
+
+
+
+ view
+
+
+ 633
+ Dotations correct. val./cr. comm. +1an
+
+
+
+ view
+
+
+ 634
+ Dotations correct. val./cr. comm. -1an
+
+
+
+ view
+
+
+ 635
+ Provisions pour pensions et oblig. sim.
+
+
+
+ view
+
+
+ 636
+ Provisions pour grosses réparations
+
+
+
+ view
+
+
+ 637
+ Provisions pour autres risques & charges
+
+
+
+ view
+
+
+ 640
+ Taxes et impôts directs
+
+
+
+ view
+
+
+ 651
+ Réductions de valeur / actifs circulants
+
+
+
+ view
+
+
+ 660
+ Dotations aux corrections de val. except
+
+
+
+ view
+
+
+ 661
+ Dotations aux corrections de val./financ
+
+
+
+ view
+
+
+ 662
+ Provisions pour risques & charges except
+
+
+
+ view
+
+
+ 750
+ Produits des immob. financières
+
+
+
+ view
+
+
+ 751
+ Produits des actifs circulants
+
+
+
+ view
+
+
+ 1750
+ Fournisseurs - dettes en compte
+
+
+
+ view
+
+
+ 1751
+ Effets à payer
+
+
+
+ view
+
+
+ 6120
+ Eau, gaz, électricité, carburants
+
+
+
+ view
+
+
+ 6123
+ Téléphone, télégrammes, frais post.
+
+
+
+ view
+
+
+ 100000
+ Capital souscrit
+
+
+
+ other
+
+
+ 101000
+ Capital non appelé (-)
+
+
+
+ other
+
+
+ 109000
+ Compte de l'exploitant
+
+
+
+ other
+
+
+ 110000
+ Primes d'émission
+
+
+
+ other
+
+
+ 120000
+ Plus-values de rééval. sur immob. incorp
+
+
+
+ other
+
+
+ 121000
+ Plus-values de rééval. sur immob. corp.
+
+
+
+ other
+
+
+ 122000
+ Plus-values de rééval. sur immob. fin.
+
+
+
+ other
+
+
+ 123000
+ Plus-values de réévaluation sur stocks
+
+
+
+ other
+
+
+ 124000
+ Reprises de réd. de val./plac. de très.
+
+
+
+ other
+
+
+ 130000
+ Réserve légale
+
+
+
+ other
+
+
+ 131000
+ Réserves indisponibles
+
+
+
+ other
+
+
+ 132000
+ Réserves immunisées
+
+
+
+ other
+
+
+ 133000
+ Réserves disponibles
+
+
+
+ other
+
+
+ 134000
+ Autres reserves
+
+
+
+ other
+
+
+ 140000
+ Résultats reportés
+
+
+
+ other
+
+
+ 140100
+ Bénéfice de l'exercice
+
+
+
+ other
+
+
+ 140200
+ Perte de l'exercice
+
+
+
+ other
+
+
+ 141000
+ Perte reportée
+
+
+
+ other
+
+
+ 150000
+ Subsides en cap. - montants obtenus
+
+
+
+ other
+
+
+ 151000
+ Subsides-montants transf. aux résultats
+
+
+
+ other
+
+
+ 160000
+ Provisions pour pensions
+
+
+
+ other
+
+
+ 161000
+ Provisions pour charges fiscales
+
+
+
+ other
+
+
+ 162000
+ Provisions pr grosses rép. & gros entr.
+
+
+
+ other
+
+
+ 163000
+ Provisions pour rente viagère
+
+
+
+ other
+
+
+ 164000
+ Provisions pr sûretés pers. et réelles
+
+
+
+ other
+
+
+ 165000
+ Provisions diverses
+
+
+
+ other
+
+
+ 165400
+ Provisions pour autres risques & charges
+
+
+
+ other
+
+
+ 166000
+ Provisions pour charges de commandes
+
+
+
+ other
+
+
+ 168000
+ Impôts différés
+
+
+
+ other
+
+
+ 169000
+ Autres provisions
+
+
+
+ other
+
+
+ 170000
+ Emprunts convertibles
+
+
+
+ other
+
+
+ 171000
+ Emprunts obligataires non convertibles
+
+
+
+ other
+
+
+ 172000
+ Dettes de loc. - financ. et assimilées
+
+
+
+ other
+
+
+ 173000
+ Etablissements de crédit
+
+
+
+ other
+
+
+ 174000
+ Autres emprunts
+
+
+
+ other
+
+
+ 175000
+ Fournisseurs - entreprises apparentées
+
+
+
+ other
+
+
+ 175010
+ Dettes en cpte - fourniss. ordinaires
+
+
+
+ other
+
+
+ 175100
+ Effets à payer - entreprises apparentées
+
+
+
+ other
+
+
+ 175110
+ Effets à payer - fournisseurs ordinaires
+
+
+
+ other
+
+
+ 176000
+ Acomptes reçus sur commandes
+
+
+
+ other
+
+
+ 177100
+ Entreprises liées
+
+
+
+ other
+
+
+ 177200
+ Lien de participation
+
+
+
+ other
+
+
+ 178000
+ Cautionnements reçus en numéraire
+
+
+
+ other
+
+
+ 179000
+ Dettes diverses
+
+
+
+ other
+
+
+ 180000
+ Comptes de liaison établiss. & succurs.
+
+
+
+ other
+
+
+ 200000
+ Frais de constitution
+
+
+
+ other
+
+
+ 200900
+ Amort s/fr de constitution
+
+
+
+ other
+
+
+ 201000
+ Frais d'augmentation de capital
+
+
+
+ other
+
+
+ 201900
+ Amort s/fr d'augmentation du capital
+
+
+
+ other
+
+
+ 202000
+ Fr.d'emission d'empr,prime remboursement
+
+
+
+ other
+
+
+ 202900
+ Amort s/fr d'émission d'emprunts
+
+
+
+ other
+
+
+ 203000
+ Autres frais d'établissement
+
+
+
+ other
+
+
+ 203900
+ Amort s/autres fr d'établissement
+
+
+
+ other
+
+
+ 204000
+ Frais de restructuration
+
+
+
+ other
+
+
+ 204900
+ Amort s/fr de restructuration
+
+
+
+ other
+
+
+ 210000
+ Frais de recherche et développement
+
+
+
+ other
+
+
+ 210900
+ Amort. s/fr de recherche et développemen
+
+
+
+ other
+
+
+ 211100
+ Concessions, brevet à titre onéreux
+
+
+
+ other
+
+
+ 211190
+ Amort. s/concession, brevet acquis
+
+
+
+ other
+
+
+ 211200
+ Conc., brevets créés par l'entr. même
+
+
+
+ other
+
+
+ 211290
+ Amort. s/concession, brevets créés
+
+
+
+ other
+
+
+ 212000
+ Fonds de commerce
+
+
+
+ other
+
+
+ 212900
+ Amort s/fonds de commerce
+
+
+
+ other
+
+
+ 213000
+ Acomptes versés s/immob. incorp
+
+
+
+ other
+
+
+ 214000
+ Surprix afférent à l'acquisit. d'1 part.
+
+
+
+ other
+
+
+ 220000
+ Terrains
+
+
+
+ other
+
+
+ 220800
+ Plus-values actées sur terrains
+
+
+
+ other
+
+
+ 220900
+ Réduction de valeur sur terrains
+
+
+
+ other
+
+
+ 221800
+ Plus-values actées sur constructions
+
+
+
+ other
+
+
+ 221900
+ Amort. sur constructions
+
+
+
+ other
+
+
+ 222800
+ Plus-values actées s/terrains bâtis
+
+
+
+ other
+
+
+ 222900
+ Amort. sur terrains bâtis
+
+
+
+ other
+
+
+ 223800
+ +values actées s/autres droits
+
+
+
+ other
+
+
+ 223900
+ Amort s/autres droits réels
+
+
+
+ other
+
+
+ 230000
+ Installations techniques
+
+
+
+ other
+
+
+ 230900
+ Amort s/installations techniques
+
+
+
+ other
+
+
+ 231000
+ Machines
+
+
+
+ other
+
+
+ 231900
+ Amortissement s/machines
+
+
+
+ other
+
+
+ 232000
+ Outillage
+
+
+
+ other
+
+
+ 233000
+ Pièces de rechange
+
+
+
+ other
+
+
+ 238000
+ Plus-values actées sur i./m./o.
+
+
+
+ other
+
+
+ 239000
+ Amortissements sur i./m./o.
+
+
+
+ other
+
+
+ 240000
+ Installation gen, agencements,..
+
+
+
+ other
+
+
+ 240900
+ Amort s/autres installations,outillage
+
+
+
+ other
+
+
+ 241000
+ Mobilier
+
+
+
+ other
+
+
+ 241900
+ Amort. sur mobilier
+
+
+
+ other
+
+
+ 242000
+ Matériel roulant
+
+
+
+ other
+
+
+ 242900
+ Amort. s/matériel roulant
+
+
+
+ other
+
+
+ 243000
+ Matériel de bureau
+
+
+
+ other
+
+
+ 243900
+ Amort. s/matériel de bureau
+
+
+
+ other
+
+
+ 250000
+ Terrains et constructions en loc.-fin.
+
+
+
+ other
+
+
+ 251000
+ Install., machines & out. en loc.-fin.
+
+
+
+ other
+
+
+ 252000
+ Mobilier et mat. roulant en loc.-fin.
+
+
+
+ other
+
+
+ 260000
+ Autres immobilisations corporelles
+
+
+
+ other
+
+
+ 270000
+ Immobilisations en cours
+
+
+
+ other
+
+
+ 271000
+ Avances & acptes versés / immob.en cours
+
+
+
+ other
+
+
+ 280000
+ Parts dans des entreprises liées
+
+
+
+ other
+
+
+ 280100
+ Montants non appelés
+
+
+
+ other
+
+
+ 280800
+ +values actées s/parts entreprises liées
+
+
+
+ other
+
+
+ 280900
+ Réduction de valeur s/parts
+
+
+
+ other
+
+
+ 281000
+ Créances s/des entreprises liées
+
+
+
+ other
+
+
+ 281100
+ Effets à recevoir
+
+
+
+ other
+
+
+ 281700
+ Créances douteuses (entreprises liées)
+
+
+
+ other
+
+
+ 281900
+ Réduction de valeur s/cré. entre. liées
+
+
+
+ other
+
+
+ 282000
+ Participations
+
+
+
+ other
+
+
+ 282100
+ Montants non appelés
+
+
+
+ other
+
+
+ 282800
+ +values actées s/participations
+
+
+
+ other
+
+
+ 282900
+ Réduction de valeur s/participations
+
+
+
+ other
+
+
+ 283000
+ Créances s/entrepr. lien de particip.
+
+
+
+ other
+
+
+ 283100
+ Effets à recevoir
+
+
+
+ other
+
+
+ 283200
+ Titres à revenu fixe
+
+
+
+ other
+
+
+ 283700
+ Créances douteuses (s/participations)
+
+
+
+ other
+
+
+ 283900
+ Réductions de valeur s/cr particip.
+
+
+
+ other
+
+
+ 284000
+ Titres à caractère d'immobilisation
+
+
+
+ other
+
+
+ 285000
+ Autres prêts
+
+
+
+ other
+
+
+ 286000
+ Actions ou parts propres
+
+
+
+ other
+
+
+ 288000
+ Cautionnements versés en numéraire
+
+
+
+ other
+
+
+ 290000
+ Créances commerciales
+
+
+
+ other
+
+
+ 290100
+ Effets à recevoir
+
+
+
+ other
+
+
+ 290600
+ Acomptes versés
+
+
+
+ other
+
+
+ 290700
+ Créances douteuses s/cr commerciales
+
+
+
+ other
+
+
+ 290900
+ Réduction de valeur s/cr commerciales
+
+
+
+ other
+
+
+ 291000
+ Autres créances
+
+
+
+ other
+
+
+ 291100
+ Effets à recevoir
+
+
+
+ other
+
+
+ 291700
+ Créances douteuses s/autres créances
+
+
+
+ other
+
+
+ 291900
+ Réduction de valeur s/autres créances
+
+
+
+ other
+
+
+ 300000
+ Stocks matières premières val. d'acquis.
+
+
+
+ other
+
+
+ 309000
+ Réduction de valeur s/mat. premières
+
+
+
+ other
+
+
+ 310000
+ Matières consommables
+
+
+
+ other
+
+
+ 310600
+ Emballages commerciaux
+
+
+
+ other
+
+
+ 319000
+ Réd. de val. - stocks fournitures (-)
+
+
+
+ other
+
+
+ 320000
+ En cours de fabrication - val. d'acquis.
+
+
+
+ other
+
+
+ 329000
+ Réductions de valeur / en cours (-)
+
+
+
+ other
+
+
+ 330000
+ Valeur d'acquisition des produits finis
+
+
+
+ other
+
+
+ 339000
+ Réduction de val. / produits finis (-)
+
+
+
+ other
+
+
+ 340000
+ Stocks marchandises - valeur d'acquis.
+
+
+
+ other
+
+
+ 349000
+ Réd. de val. / stocks marchandises (-)
+
+
+
+ other
+
+
+ 360000
+ Acomptes versés / achats pour stocks
+
+
+
+ other
+
+
+ 369000
+ Réd. de val. / acptes versés stocks (-)
+
+
+
+ other
+
+
+ 400000
+ Clients
+
+
+
+ other
+
+
+ 401000
+ Effets à recevoir - clients
+
+ True
+
+
+ receivable
+
+
+
+ 403000
+ Créances s/entreprises apparentées
+
+
+
+ receivable
+
+
+ 404000
+ Produits à recevoir (factures à établir)
+
+
+
+ other
+
+
+ 406000
+ Acomptes versés aux fournisseurs
+
+
+
+ payable
+
+
+ 407000
+ Créances commerciales douteuses
+
+
+
+ other
+
+
+ 408000
+ Ecarts de conversion de devises/créances
+
+
+
+ other
+
+
+ 409000
+ Réductions de valeur / créances comm.
+
+
+
+ other
+
+
+ 410000
+ Capital appelé, non versé
+
+
+
+ other
+
+
+ 411000
+ T.v.a en amont
+
+ True
+
+ other
+
+
+ 411100
+ T.v.a soumise à l'origine amont
+
+
+
+ other
+
+
+ 411500
+ Compte courant tva
+
+
+
+ other
+
+
+ 412000
+ Impots et vers. fiscaux à récupérer
+
+
+
+ other
+
+
+ 413100
+ Autres créances sur entrepr. liées
+
+
+
+ other
+
+
+ 413200
+ Autres créances / entrepr. apparentées
+
+
+
+ other
+
+
+ 414000
+ Produits à recevoir (non commerciaux)
+
+
+
+ other
+
+
+ 416000
+ Créances diverses
+
+
+
+ other
+
+
+ 417000
+ Créances douteuses
+
+
+
+ other
+
+
+ 418000
+ Cautionnements versés en numéraire
+
+
+
+ other
+
+
+ 419000
+ Réductions de val. / autres créances (-)
+
+
+
+ other
+
+
+ 420000
+ Emprunts obligataires convert.
+
+
+
+ other
+
+
+ 421000
+ Emprunts oblig. non convertibles
+
+
+
+ other
+
+
+ 422000
+ Dettes de location-financ. et assimilées
+
+
+
+ other
+
+
+ 423000
+ Etablissements de crédit
+
+
+
+ other
+
+
+ 424000
+ Autres emprunts
+
+
+
+ other
+
+
+ 425000
+ Fournisseurs
+
+
+
+ other
+
+
+ 425100
+ Effets à payer
+
+
+
+ other
+
+
+ 426000
+ Acomptes reçus / commandes éch. ds l'an
+
+
+
+ other
+
+
+ 427100
+ Entreprises liées
+
+
+
+ other
+
+
+ 427200
+ Lien de participation
+
+
+
+ other
+
+
+ 428000
+ Cautionnements reçus en numéraire
+
+
+
+ other
+
+
+ 429000
+ Dettes diverses échéant dans l'année
+
+
+
+ other
+
+
+ 430000
+ Banques-emprunts en compte à terme fixe
+
+
+
+ other
+
+
+ 431000
+ Banques-promesses
+
+
+
+ other
+
+
+ 432000
+ Banques-crédit d'acceptation
+
+
+
+ other
+
+
+ 433000
+ Banques-dettes en compte courant
+
+
+
+ other
+
+
+ 438000
+ Autres emprunts
+
+
+
+ other
+
+
+ 440000
+ Fournisseurs
+
+
+
+ other
+
+
+ 441000
+ Effets à payer
+
+ True
+
+
+ other
+
+
+ 442000
+ Factures à recevoir
+
+ True
+
+
+ other
+
+
+ 443100
+ Entreprises liées
+
+
+
+ other
+
+
+ 443200
+ Lien de participation
+
+
+
+ other
+
+
+ 450000
+ Dettes fiscales estimées
+
+
+
+ other
+
+
+ 451000
+ T.v.a en aval
+
+ True
+
+
+ other
+
+
+ 451100
+ T.v.a soumise à l'origine aval
+
+ True
+
+
+ other
+
+
+ 451200
+ T.v.a intracom
+
+ True
+
+
+ other
+
+
+ 451500
+ Compte courant tva
+
+
+
+ other
+
+
+ 452000
+ Impôts et taxes à payer à l'état
+
+
+
+ other
+
+
+ 452100
+ Impôts et taxes à payer aux adm commun
+
+
+
+ other
+
+
+ 453000
+ Retenues s/salaires
+
+
+
+ other
+
+
+ 454000
+ Cass (centre..de sécurite soc)
+
+
+
+ other
+
+
+ 455000
+ Personnel-rémuneration à payer
+
+
+
+ other
+
+
+ 456000
+ Personnel-avances et acomptes
+
+
+
+ other
+
+
+ 458000
+ Autres dettes sociales
+
+
+
+ other
+
+
+ 460000
+ Acomptes reçus sur commandes
+
+
+
+ other
+
+
+ 470000
+ Dividendes-tantièmes d'ex. ant. à payer
+
+
+
+ other
+
+
+ 471000
+ Dividendes de l'exercice à payer
+
+
+
+ other
+
+
+ 472000
+ Tantièmes de l'exercice à payer
+
+
+
+ other
+
+
+ 473000
+ Autres allocataires à payer
+
+
+
+ other
+
+
+ 480000
+ Obligations et coupons échus (dettes)
+
+
+
+ other
+
+
+ 487000
+ Cautionnements reçus en numeraire
+
+
+
+ other
+
+
+ 488000
+ Autres dettes diverses
+
+
+
+ other
+
+
+ 490000
+ Charges à reporter (payées d'avance)
+
+
+
+ other
+
+
+ 491000
+ Produits acquis
+
+
+
+ other
+
+
+ 492000
+ Charges à imputer
+
+
+
+ other
+
+
+ 493000
+ Produits à reporter
+
+
+
+ other
+
+
+ 499000
+ Comptes d'attente
+
+
+
+ other
+
+
+ 499800
+ Solde équilibre en devises (hors pc)
+
+
+
+ other
+
+
+ 500000
+ Actions propres
+
+
+
+ other
+
+
+ 510000
+ Actions et parts
+
+
+
+ other
+
+
+ 510100
+ Montant non appelé s/action.part
+
+
+
+ other
+
+
+ 510900
+ Réduction valeur s/action et parts
+
+
+
+ other
+
+
+ 512000
+ Parts dans entreprises liées
+
+
+
+ other
+
+
+ 512100
+ Montant non appelé s/parts
+
+
+
+ other
+
+
+ 512900
+ Réduction valeur s/part ent. liées
+
+
+
+ other
+
+
+ 520000
+ Titres à rev. fixes - valeur d'acquis.
+
+
+
+ other
+
+
+ 529000
+ Titres à rev. fixes - réd. de val.
+
+
+
+ other
+
+
+ 530000
+ Dépôts à terme
+
+
+
+ other
+
+
+ 539000
+ Réductions de valeur / dépôts à terme
+
+
+
+ other
+
+
+ 540000
+ Valeurs échues à l'encaissement
+
+
+
+ other
+
+
+ 541000
+ Coupons à encaisser
+
+
+
+ other
+
+
+ 550000
+ Ets de crédit-compte à vue
+
+
+
+ other
+
+
+ 550100
+ Chèques et virements émis
+
+
+
+ other
+
+
+ 550900
+ Réduction valeur s/cpte a vue
+
+
+
+ other
+
+
+ 560000
+ Ccp - compte courant
+
+
+
+ other
+
+
+ 561000
+ Ccp - chèques émis
+
+
+
+ other
+
+
+ 570000
+ Caisses
+
+
+
+ other
+
+
+ 570900
+ Réduction valeur s/caisse
+
+
+
+ other
+
+
+ 580000
+ Virements internes
+
+ True
+
+
+ other
+
+
+ 600000
+ Achats de matières premières
+
+
+
+ other
+
+
+ 601000
+ Achats de fournitures
+
+
+
+ other
+
+
+ 602000
+ Achats de services, travaux et études
+
+
+
+ other
+
+
+ 603000
+ Achats de sous-traitances générales
+
+
+
+ other
+
+
+ 604000
+ Achats de marchandises
+
+
+
+ other
+
+
+ 607000
+ Achats produits et demi-produits
+
+
+
+ other
+
+
+ 608000
+ Remises, ristournes et rabais sur achats
+
+
+
+ other
+
+
+ 609000
+ Variation de stock mat. premières
+
+
+
+ other
+
+
+ 609100
+ Variation stock mat. consommables
+
+
+
+ other
+
+
+ 609400
+ Variation stock marchandises
+
+
+
+ other
+
+
+ 610000
+ Loyers et charges locatives
+
+
+
+ other
+
+
+ 610100
+ Redevances de crédit bail
+
+
+
+ other
+
+
+ 611000
+ Entretiens et réparations des locaux
+
+
+
+ other
+
+
+ 612000
+ Consommation - eau
+
+
+
+ other
+
+
+ 612010
+ Consommation - gaz
+
+
+
+ other
+
+
+ 612020
+ Consommation - électricité
+
+
+
+ other
+
+
+ 612030
+ Consommation - carburants
+
+
+
+ other
+
+
+ 612040
+ Consommation - mazout
+
+
+
+ other
+
+
+ 612100
+ Documentation
+
+
+
+ other
+
+
+ 612200
+ Imprimés et fournitures de bureau
+
+
+
+ other
+
+
+ 612300
+ Téléphone
+
+
+
+ other
+
+
+ 612310
+ Frais postaux
+
+
+
+ other
+
+
+ 612320
+ Fax
+
+
+
+ other
+
+
+ 613000
+ Redevances et royalties
+
+
+
+ other
+
+
+ 613100
+ Honoraires
+
+
+
+ other
+
+
+ 613200
+ Organismes de services
+
+
+
+ other
+
+
+ 613300
+ Commissions
+
+
+
+ other
+
+
+ 614000
+ Assurance incendie
+
+
+
+ other
+
+
+ 615000
+ Annonces, publicité
+
+
+
+ other
+
+
+ 615100
+ Cotisations et abonnements
+
+
+
+ other
+
+
+ 615200
+ Dons et libéralités
+
+
+
+ other
+
+
+ 615300
+ Publications légales
+
+
+
+ other
+
+
+ 616000
+ Sous-traitants
+
+
+
+ other
+
+
+ 616100
+ Transports par tiers
+
+
+
+ other
+
+
+ 620000
+ Rémunératons administrat. ou gérants
+
+
+
+ other
+
+
+ 620100
+ Rémunérations personnel de direction
+
+
+
+ other
+
+
+ 620200
+ Rémunérations employés
+
+
+
+ other
+
+
+ 620300
+ Rémunérations ouvriers
+
+
+
+ other
+
+
+ 621000
+ Chg.soc.lég.administ.et gérant
+
+
+
+ other
+
+
+ 621100
+ Chg.soc.lég. personnel de direction
+
+
+
+ other
+
+
+ 621200
+ Chg.soc.lég. employés
+
+
+
+ other
+
+
+ 621300
+ Chg.soc.lég. ouvriers
+
+
+
+ other
+
+
+ 621400
+ Assurance accidents
+
+
+
+ other
+
+
+ 622000
+ Primes patr. pour ass. extra - légales
+
+
+
+ other
+
+
+ 623000
+ Autres frais de personnel
+
+
+
+ other
+
+
+ 624000
+ Pension administrat. ou gérant
+
+
+
+ other
+
+
+ 624100
+ Pension personnel
+
+
+
+ other
+
+
+ 630000
+ Dot. cor. val s/frais d'établissement
+
+
+
+ other
+
+
+ 630100
+ Dot. cor. val s/immob. incorporels
+
+
+
+ other
+
+
+ 630200
+ Dot. cor. val s/immob. corporels
+
+
+
+ other
+
+
+ 631000
+ Dot. cor. val s/stock mat.fourni
+
+
+
+ other
+
+
+ 631100
+ Reprises cor. val. s/stock mat. fourni
+
+
+
+ other
+
+
+ 632000
+ Dot. cor. val s/en-cours,pr fini
+
+
+
+ other
+
+
+ 632100
+ Reprises cor. val s/en-cours,pf
+
+
+
+ other
+
+
+ 633000
+ Dot. cor. val s/cr comm +1an
+
+
+
+ other
+
+
+ 633100
+ Reprises cor. val s/cr com +1an
+
+
+
+ other
+
+
+ 634000
+ Dot. cor. val. s/cr comm -1an
+
+
+
+ other
+
+
+ 634100
+ Reprises cor. val.s/cr com -1an
+
+
+
+ other
+
+
+ 635000
+ Dot. prov. pension et oblig. sim.
+
+
+
+ other
+
+
+ 635100
+ Reprises prov. s/pens.obli. sim.
+
+
+
+ other
+
+
+ 636000
+ Dot. prov-grosses réparation
+
+
+
+ other
+
+
+ 636100
+ Reprises prov. grosses réparation
+
+
+
+ other
+
+
+ 637000
+ Dot. prov-autres risques et chg
+
+
+
+ other
+
+
+ 637100
+ Reprises prov autres risq,chg
+
+
+
+ other
+
+
+ 640000
+ Taxe d'abonnement
+
+
+
+ other
+
+
+ 640100
+ Impôt foncier
+
+
+
+ other
+
+
+ 640200
+ Impôt commercial s/le capital
+
+
+
+ other
+
+
+ 640300
+ Impôt s/la fortune
+
+
+
+ other
+
+
+ 641000
+ Moins-val. sur réalis. d'immob. corp.
+
+
+
+ other
+
+
+ 642000
+ Moins-val. / réalis. de créances comm.
+
+
+
+ other
+
+
+ 643000
+ Charges d'exploitation diverses
+
+
+
+ other
+
+
+ 650000
+ Intérêts, commissions et frais / dettes
+
+
+
+ other
+
+
+ 651000
+ Dot. cor. val s/actif circ
+
+
+
+ other
+
+
+ 651100
+ Reprises cor. val s/actif circulants
+
+
+
+ other
+
+
+ 652000
+ Moins-values sur réalis. d'actifs circ.
+
+
+
+ other
+
+
+ 653000
+ Charges d'escompte de créances
+
+
+
+ other
+
+
+ 654000
+ Différences de change
+
+
+
+ other
+
+
+ 655000
+ Ecarts de conversion des devises
+
+
+
+ other
+
+
+ 656000
+ Frais de banque
+
+
+
+ other
+
+
+ 660000
+ Dot. cor. val exceptionnelles
+
+
+
+ other
+
+
+ 660100
+ Reprises cor. val. excep
+
+
+
+ other
+
+
+ 661000
+ Dot. cor. val s/immob. financières
+
+
+
+ other
+
+
+ 661100
+ Reprises cor val s/immob. fin.
+
+
+
+ other
+
+
+ 662000
+ Dot. prov-risques et chg except.
+
+
+
+ other
+
+
+ 662100
+ Reprises prov risq,chg except.
+
+
+
+ other
+
+
+ 663000
+ Moins-values sur réalis. d'actifs immob.
+
+
+
+ other
+
+
+ 665000
+ Différences de change exceptionnelles
+
+
+
+ other
+
+
+ 668000
+ Autres charges exceptionnelles
+
+
+
+ other
+
+
+ 670000
+ Impôts luxemb sur le résultat de l'ex.
+
+
+
+ other
+
+
+ 671000
+ Impôts luxemb /résultat d'ex. antérieurs
+
+
+
+ other
+
+
+ 672000
+ Impôts étrangers sur le résultat de l'ex
+
+
+
+ other
+
+
+ 673000
+ Impôts étrgs/résultat d'ex. antérieurs
+
+
+
+ other
+
+
+ 674000
+ Impôts sur résultats exceptionnels
+
+
+
+ other
+
+
+ 680000
+ Transfert aux réserves immunisées
+
+
+
+ other
+
+
+ 700000
+ Ventes et prestations de services
+
+
+
+ payable
+
+
+ 708000
+ R.r.r accordés sur ventes
+
+
+
+ payable
+
+
+ 712000
+ Variation de stocks des encours de fabr.
+
+
+
+ payable
+
+
+ 713000
+ Variation de stocks des produits finis
+
+
+
+ payable
+
+
+ 720000
+ Travaux effect. par entreprise elle-même
+
+
+
+ payable
+
+
+ 740000
+ Subsides d'exploitation
+
+
+
+ payable
+
+
+ 741000
+ Plus-values sur réal. d'immob. corp.
+
+
+
+ payable
+
+
+ 742000
+ Plus-values sur réalis. créances comm.
+
+
+
+ payable
+
+
+ 743000
+ Récupération de frais de personnel
+
+
+
+ payable
+
+
+ 744000
+ Commissions et courtages
+
+
+
+ payable
+
+
+ 745000
+ Redevances pour brevets et licences
+
+
+
+ payable
+
+
+ 746000
+ Loyers perçus
+
+
+
+ payable
+
+
+ 748000
+ Produits d'exploitation divers.
+
+
+
+ payable
+
+
+ 750000
+ Produits des participations
+
+
+
+ payable
+
+
+ 750100
+ Autres produits des immob. financières
+
+
+
+ payable
+
+
+ 751000
+ Produits des valeurs mobilières
+
+
+
+ payable
+
+
+ 751100
+ Autres produits des actifs circulants
+
+
+
+ payable
+
+
+ 752000
+ Plus-values sur réalis. d'actifs circula
+
+
+
+ payable
+
+
+ 753000
+ Subsides en capital et en intérêts
+
+
+
+ payable
+
+
+ 754000
+ Différences de change
+
+
+
+ payable
+
+
+ 754100
+ Amendes pour retards de paiement
+
+
+
+ payable
+
+
+ 754200
+ Intérêts retards de paiement
+
+
+
+ payable
+
+
+ 755000
+ Ecarts de conversion de devises
+
+
+
+ payable
+
+
+ 756000
+ Autres produits financiers
+
+
+
+ payable
+
+
+ 757000
+ Escomptes obtenus
+
+
+
+ payable
+
+
+ 763000
+ Plus-values sur réalis. d'actifs immob.
+
+
+
+ payable
+
+
+ 771000
+ Régularis. d'impôts luxemb sur résultat
+
+
+
+ payable
+
+
+ 773000
+ Régularis. d'impôts étrangers / résultat
+
+
+
+ payable
+
+
+
+
+
+ PCMN for Luxembourg
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/l10n_lu/l10n_lu_report.xml b/addons/l10n_lu/l10n_lu_report.xml
new file mode 100644
index 00000000000..192b603e1af
--- /dev/null
+++ b/addons/l10n_lu/l10n_lu_report.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
diff --git a/addons/l10n_lu/l10n_lu_wizard.xml b/addons/l10n_lu/l10n_lu_wizard.xml
new file mode 100644
index 00000000000..dd16b17d429
--- /dev/null
+++ b/addons/l10n_lu/l10n_lu_wizard.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+ Generate Chart of Accounts from a Chart Template
+ Generate Chart of Accounts from a Chart Template. You will be asked to select the company, the chart template, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
+This is the same wizard that runs from Financial Managament/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.
+
+ open
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/l10n_lu/wizard/2008_DECL_F_M10.pdf b/addons/l10n_lu/wizard/2008_DECL_F_M10.pdf
new file mode 100755
index 00000000000..8e56cbbd703
--- /dev/null
+++ b/addons/l10n_lu/wizard/2008_DECL_F_M10.pdf
@@ -0,0 +1,1254 @@
+%PDF-1.4
+%
+3 0 obj<>/T(info_name)/BS<>/V()/Ff 0/Rect[270 698 567.52 710.34]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+5 0 obj<>/T(info_address)/BS<>/V()/Ff 0/Rect[273.05 668.1 570.57 680.64]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+7 0 obj<>/T(info_address2)/BS<>/V()/Ff 0/Rect[274.83 642.68 572.35 655.03]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+9 0 obj<>/T(info_vatnum)/BS<>/V()/Ff 0/Rect[393.68 765.95 570.57 776.81]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+11 0 obj<>/T(case_03)/BS<>/V()/Ff 0/Q 2/Rect[354.7 567.83 446.09 578.69]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+13 0 obj<>/T(case_04)/BS<>/V()/Ff 0/Q 2/Rect[353.63 551.99 445.31 564.14]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+15 0 obj<>/T(case_05)/BS<>/V()/Ff 0/Q 2/Rect[352.78 538.71 443.89 549.58]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+17 0 obj<>/T(case_06)/BS<>/V()/Ff 0/Q 2/Rect[352.78 523.52 445.02 534.38]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+19 0 obj<>/T(case_08)/BS<>/V()/Ff 0/Q 2/Rect[352.99 509.6 443.6 519.9]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+21 0 obj<>/T(case_09)/BS<>/V()/Ff 0/Q 2/Rect[354.34 492.49 444.74 503.35]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+23 0 obj<>/T(case_11)/BS<>/V()/Ff 0/Q 2/Rect[355.55 461.32 445.87 472.18]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+25 0 obj<>/T(case_12)/BS<>/V()/Ff 0/Q 2/Rect[354.34 444.2 445.73 455.07]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+27 0 obj<>/T(case_13)/BS<>/V()/Ff 0/Q 2/Rect[354.34 429.64 446.23 440.51]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+29 0 obj<>/T(case_14)/BS<>/V()/Ff 0/Q 2/Rect[355.55 415.73 447.36 426.59]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+31 0 obj<>/T(case_15)/BS<>/V()/Ff 0/Q 2/Rect[354.34 401.17 445.3 412.04]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+33 0 obj<>/T(case_16)/BS<>/V()/Ff 0/Q 2/Rect[354.34 355.3 445.16 366.17]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+35 0 obj<>/T(case_17)/BS<>/V()/Ff 0/Q 2/Rect[353.63 338.19 445.01 350.97]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+37 0 obj<>/T(case_19)/BS<>/V()/Ff 0/Q 2/Rect[354.34 321.71 445.51 335.77]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+39 0 obj<>/T(case_22)/BS<>/V()/Ff 0/Q 2/Rect[354.7 303.96 446.01 317.38]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+41 0 obj<>/T(case_32)/BS<>/V()/Ff 0/Q 2/Rect[355.98 288.77 447.14 302]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+43 0 obj<>/T(case_33)/BS<>/V()/Ff 0/Q 2/Rect[355.98 274.21 447.64 288.77]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+45 0 obj<>/T(case_34)/BS<>/V()/Ff 0/Q 2/Rect[354.7 259.65 446.22 273.07]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+47 0 obj<>/T(case_35)/BS<>/V()/Ff 0/Q 2/Rect[354.7 245.1 446.07 257.88]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+49 0 obj<>/T(case_82)/BS<>/V()/Ff 0/Q 2/Rect[355.55 230.54 447.21 243.96]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+51 0 obj<>/T(case_37)/BS<>/V()/Ff 0/Q 2/Rect[482.13 289.48 565.8 299.63]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+53 0 obj<>/T(case_38)/BS<>/V()/Ff 0/Q 2/Rect[482.13 274.29 566.44 284]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+55 0 obj<>/T(case_39)/BS<>/V()/Ff 0/Q 2/Rect[482.13 259.09 565.01 269.88]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+57 0 obj<>/T(case_40)/BS<>/V()/Ff 0/Q 2/Rect[482.13 244.53 565.51 255.96]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+59 0 obj<>/T(case_83)/BS<>/V()/Ff 0/Q 2/Rect[482.13 229.34 566.01 241.41]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+61 0 obj<>/T(case_41)/BS<>/V()/Ff 0/Q 2/Rect[482.13 214.14 565.86 225.01]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+63 0 obj<>/T(case_47)/BS<>/V()/Ff 0/Q 2/Rect[482.13 179.77 565.72 193.96]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+65 0 obj<>/T(case_48)/BS<>/V()/Ff 0/Q 2/Rect[482.13 164.58 566.22 177.92]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+67 0 obj<>/T(case_49)/BS<>/V()/Ff 0/Q 2/Rect[482.13 150.66 566.07 163.57]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+69 0 obj<>/T(case_50)/BS<>/V()/Ff 0/Q 2/Rect[482.13 136.1 565.93 149.65]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+71 0 obj<>/T(case_51)/BS<>/V()/Ff 0/Q 2/Rect[482.13 104.93 565.79 118.48]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+73 0 obj<>/T(case_86)/BS<>/V()/Ff 0/Q 2/Rect[482.13 40.52 566.28 51.52]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+75 0 obj<>/T(case_42)/BS<>/V()/Ff 0/Q 2/Rect[353.63 180.2 445.15 190.77]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+77 0 obj<>/T(case_43)/BS<>/V()/Ff 0/Q 2/Rect[354.34 165 445.65 177.92]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+79 0 obj<>/T(case_44)/BS<>/V()/Ff 0/Q 2/Rect[354.7 149.8 446.14 163.57]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+81 0 obj<>/T(case_45)/BS<>/V()/Ff 0/Q 2/Rect[355.55 136.53 447.28 148.38]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+83 0 obj<>/T(case_85)/BS<>/V()/Ff 0/Q 2/Rect[354.7 120.69 446.5 132.83]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+85 0 obj<>/T(case_46)/BS<>/V()/Ff 0/Q 2/Rect[355.98 105.5 448.27 117.2]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+87 0 obj<>/T(case_52)/BS<>/V()/Ff 0/Q 2/Rect[354.7 64.1 446.21 74.96]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+91 0 obj<>
+endobj
+92 0 obj<>>>/Parent 91 0 R/BS<>/AS/Off/V/Off/Rect[102.89 569.1 108 574.22]/Subtype/Widget/DR<>>>/DA(/ZaDb 10 Tf 0 0 0 rg )/MK<>/FT/Btn>>
+endobj
+95 0 obj<>
+endobj
+96 0 obj<>>>/Parent 95 0 R/BS<>/AS/Off/V/Off/Rect[166.16 569.1 171.92 574.22]/Subtype/Widget/DR<>>>/DA(/ZaDb 10 Tf 0 0 0 rg )/MK<>/FT/Btn>>
+endobj
+98 0 obj<>/T(case_84)/BS<>/V()/Ff 0/Q 2/Rect[295.9 230.54 310.6 241.41]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+100 0 obj<>/T(case_07)/BS<>/V()/Ff 0/Rect[85 507.68 333.61 519.9]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+102 0 obj<>/T(case_18)/BS<>/V()/Ff 0/Rect[85 323.05 333.61 334.56]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+104 0 obj<>/T(case_53)/BS<>/V()/Ff 0/Q 2/Rect[331.69 760.83 421.02 773.62]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+106 0 obj<>/T(case_54)/BS<>/V()/Ff 0/Q 2/Rect[331.69 745.64 421.02 758.42]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+108 0 obj<>/T(case_55)/BS<>/V()/Ff 0/Q 2/Rect[331.69 731.72 422.16 743.86]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+110 0 obj<>/T(case_56)/BS<>/V()/Ff 0/Q 2/Rect[331.69 715.89 420.74 728.03]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+112 0 obj<>/T(case_81)/BS<>/V()/Ff 0/Q 2/Rect[331.69 699.41 420.59 712.2]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+114 0 obj<>/T(case_57)/BS<>/V()/Ff 0/Q 2/Rect[331.69 665.04 421.73 677.83]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+116 0 obj<>/T(case_58)/BS<>/V()/Ff 0/Q 2/Rect[331.69 650.49 420.95 663.27]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+118 0 obj<>/T(case_59)/BS<>/V()/Ff 0/Q 2/Rect[331.69 635.93 420.8 648.71]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+120 0 obj<>/T(case_60)/BS<>/V()/Ff 0/Q 2/Rect[331.69 621.38 421.94 634.8]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+122 0 obj<>/T(case_61)/BS<>/V()/Ff 0/Q 2/Rect[331.69 589.56 420.52 602.34]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+124 0 obj<>/T(case_88)/BS<>/V()/Ff 0/Q 2/Rect[331.69 550.72 421.01 563.5]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+126 0 obj<>/T(case_89)/BS<>/V()/Ff 0/Q 2/Rect[331.69 536.16 420.87 548.95]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+128 0 obj<>/T(case_90)/BS<>/V()/Ff 0/Q 2/Rect[331.69 520.97 420.73 533.75]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+130 0 obj<>/T(case_91)/BS<>/V()/Ff 0/Q 2/Rect[331.69 507.05 421.23 519.83]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+132 0 obj<>/T(case_422)/BS<>/V()/Ff 0/Q 2/Rect[331.69 490.58 421.08 503.36]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+134 0 obj<>/T(case_92)/BS<>/V()/Ff 0/Q 2/Rect[331.69 467.71 420.94 480.49]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+136 0 obj<>/T(case_10)/BS<>/V()/Ff 0/Q 2/Rect[331.69 449.96 420.8 462.74]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+138 0 obj<>/T(case_87)/BS<>/V()/Ff 0/Q 2/Rect[472.79 783.98 556.08 796.77]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+140 0 obj<>/T(case_62)/BS<>/V()/Ff 0/Q 2/Rect[472.79 760.48 555.94 773.62]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+142 0 obj<>/T(case_63)/BS<>/V()/Ff 0/Q 2/Rect[472.79 745.28 556.44 758.42]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+144 0 obj<>/T(case_64)/BS<>/V()/Ff 0/Q 2/Rect[472.79 730.73 556.29 743.86]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+146 0 obj<>/T(case_65)/BS<>/V()/Ff 0/Q 2/Rect[472.79 717.45 556.15 730.73]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+148 0 obj<>/T(case_70)/BS<>/V()/Ff 0/Q 2/Rect[472.79 685 556.65 698]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+150 0 obj<>/T(case_66)/BS<>/V()/Ff 0/Q 2/Rect[472.79 664.05 555.86 677.83]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+153 0 obj<>
+endobj
+154 0 obj<>/Parent 153 0 R/BS<>/Ff 0/Q 2/Rect[472.79 650.14 557.64 664.05]/Subtype/Widget/DR<>>>/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+155 0 obj<>/Parent 153 0 R/BS<>/Ff 0/Q 2/Rect[472.79 635.58 555.58 648.71]/Subtype/Widget/DR<>>>/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+156 0 obj<>
+endobj
+158 0 obj<>/T(case_69)/BS<>/V()/Ff 0/Q 2/Rect[472.79 621.66 556.08 634.8]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+160 0 obj<>/T(case_71)/BS<>/V()/Ff 0/Q 2/Rect[472.79 603.27 554.65 617.33]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+162 0 obj<>/T(case_93)/BS<>/V()/Ff 0/Q 2/Rect[472.79 550.37 555.15 564.43]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+164 0 obj<>/T(case_94)/BS<>/V()/Ff 0/Q 2/Rect[472.79 535.81 555.65 550.37]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+166 0 obj<>/T(case_95)/BS<>/V()/Ff 0/Q 2/Rect[472.79 521.89 555.5 535.81]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+168 0 obj<>/T(case_96)/BS<>/V()/Ff 0/Q 2/Rect[472.79 506.7 556 520.97]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+170 0 obj<>/T(case_219)/BS<>/V()/Ff 0/Q 2/Rect[472.79 490.23 555.22 505.42]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+172 0 obj<>/T(case_97)/BS<>/V()/Ff 0/Q 2/Rect[472.79 466.72 555.71 480.49]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+174 0 obj<>/T(case_72)/BS<>/V()/Ff 0/Q 2/Rect[472.79 428.52 555.57 442.58]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+176 0 obj<>/T(case_23)/BS<>/V()/Ff 0/Q 2/Rect[474.2 381.37 556.71 395.43]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+178 0 obj<>/T(case_24)/BS<>/V()/Ff 0/Q 2/Rect[474.2 365.53 557.2 379.59]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+180 0 obj<>/T(case_25)/BS<>/V()/Ff 0/Q 2/Rect[474.2 351.61 556.42 365.68]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+182 0 obj<>/T(case_26)/BS<>/V()/Ff 0/Q 2/Rect[474.2 337.06 556.92 351.61]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+184 0 obj<>/T(case_27)/BS<>/V()/Ff 0/Q 2/Rect[474.2 321.86 556.77 335.92]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+186 0 obj<>/T(case_28)/BS<>/V()/Ff 0/Q 2/Rect[474.2 307.95 557.27 321.86]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+188 0 obj<>/T(case_29)/BS<>/V()/Ff 0/Q 2/Rect[474.2 292.11 556.49 306.17]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+190 0 obj<>/T(case_30)/BS<>/V()/Ff 0/Q 2/Rect[474.2 277.56 556.34 292.11]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+192 0 obj<>/T(case_31)/BS<>/V()/Ff 0/Q 2/Rect[474.2 262.36 556.84 276.42]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+194 0 obj<>/T(case_98)/BS<>/V()/Ff 0/Q 2/Rect[474.2 224.16 556.06 238.22]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+196 0 obj<>/T(case_73)/BS<>/V()/Ff 0/Q 2/Rect[474.2 208.96 556.55 223.02]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+198 0 obj<>/T(case_74)/BS<>/V()/Ff 0/Q 2/Rect[474.2 191.85 555.86 205.91]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+200 0 obj<>/T(info_vatnum_p2)/BS<>/V()/Ff 0/Rect[120.15 799.82 254.36 813.88]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+202 0 obj<>/T(info_creator)/BS<>/V()/Ff 0/Rect[63.91 150.5 242.22 163.92]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+204 0 obj<>/T(info_date_creation)/BS<>/V()/Ff 0/Rect[261.39 150.5 373.23 163.92]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+206 0 obj<>/T(info_signature)/BS<>/V()/Ff 0/Rect[389.21 150.5 547.07 167.11]/Subtype/Widget/DR<>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>>
+endobj
+207 0 obj<>
+endobj
+2 0 obj<>
+endobj
+89 0 obj<>
+endobj
+44 0 obj <>>>/Subtype/Form/BBox[0 0 91.52 13.42]>>stream
+xPpuVpb
+endstream
+endobj
+139 0 obj <>>>/Subtype/Form/BBox[0 0 83.15 13.14]>>stream
+xPpuVpb
+endstream
+endobj
+74 0 obj <>>>/Subtype/Form/BBox[0 0 91.52 10.57]>>stream
+xPpuVpb
+endstream
+endobj
+82 0 obj <>>>/Subtype/Form/BBox[0 0 91.8 12.14]>>stream
+xPpuVpb
+endstream
+endobj
+22 0 obj <>>>/Subtype/Form/BBox[0 0 90.32 10.86]>>stream
+xPpuVpb
+endstream
+endobj
+66 0 obj <>>>/Subtype/Form/BBox[0 0 83.95 12.91]>>stream
+xPpuVpb
+endstream
+endobj
+50 0 obj <>>>/Subtype/Form/BBox[0 0 83.67 10.15]>>stream
+xPpuVpb
+endstream
+endobj
+201 0 obj <>>>/Subtype/Form/BBox[0 0 178.31 13.42]>>stream
+xPpuVpb
+endstream
+endobj
+101 0 obj <>>>/Subtype/Form/BBox[0 0 248.61 11.5]>>stream
+xPpuVpb
+endstream
+endobj
+193 0 obj <>>>/Subtype/Form/BBox[0 0 81.86 14.06]>>stream
+xPpuVpb
+endstream
+endobj
+167 0 obj <>>>/Subtype/Form/BBox[0 0 83.21 14.27]>>stream
+xPpuVpb
+endstream
+endobj
+88 0 obj <>>>/Subtype/Form/BBox[0 0 5.11 5.11]>>stream
+x+T0Bc=C(Q` E
+N!
+Q.I
+
+!i@ qC]= c#eifaba Z
+endstream
+endobj
+76 0 obj <>>>/Subtype/Form/BBox[0 0 91.31 12.92]>>stream
+xPpuVpb
+endstream
+endobj
+26 0 obj <>>>/Subtype/Form/BBox[0 0 91.89 10.87]>>stream
+xPpuVpb
+endstream
+endobj
+191 0 obj <>>>/Subtype/Form/BBox[0 0 82.64 14.06]>>stream
+xPpuVpb
+endstream
+endobj
+24 0 obj <>>>/Subtype/Form/BBox[0 0 91.39 10.86]>>stream
+xPpuVpb
+endstream
+endobj
+6 0 obj <>>>/Subtype/Form/BBox[0 0 297.52 12.35]>>stream
+xPpuVpb
+endstream
+endobj
+30 0 obj <>>>/Subtype/Form/BBox[0 0 90.96 10.86]>>stream
+xPpuVpb
+endstream
+endobj
+203 0 obj <>>>/Subtype/Form/BBox[0 0 111.84 13.42]>>stream
+xPpuVpb
+endstream
+endobj
+94 0 obj <>/Subtype/Form/BBox[0 0 5.75 5.11]>>stream
+x
+endstream
+endobj
+99 0 obj <>>>/Subtype/Form/BBox[0 0 248.61 12.21]>>stream
+xPpuVpb
+endstream
+endobj
+20 0 obj <>>>/Subtype/Form/BBox[0 0 90.4 10.86]>>stream
+xPpuVpb
+endstream
+endobj
+105 0 obj <>>>/Subtype/Form/BBox[0 0 89.33 12.78]>>stream
+xPpuVpb
+endstream
+endobj
+90 0 obj <>/Subtype/Form/BBox[0 0 5.11 5.11]>>stream
+x
+endstream
+endobj
+80 0 obj <>>>/Subtype/Form/BBox[0 0 91.73 11.85]>>stream
+xPpuVpb
+endstream
+endobj
+161 0 obj <>>>/Subtype/Form/BBox[0 0 82.36 14.06]>>stream
+xPpuVpb
+endstream
+endobj
+38 0 obj <>>>/Subtype/Form/BBox[0 0 91.31 13.42]>>stream
+xPpuVpb
+endstream
+endobj
+125 0 obj <>>>/Subtype/Form/BBox[0 0 89.18 12.78]>>stream
+xPpuVpb
+endstream
+endobj
+113 0 obj <>>>/Subtype/Form/BBox[0 0 90.04 12.78]>>stream
+xPpuVpb
+endstream
+endobj
+46 0 obj <>>>/Subtype/Form/BBox[0 0 91.38 12.78]>>stream
+xPpuVpb
+endstream
+endobj
+40 0 obj <>>>/Subtype/Form/BBox[0 0 91.17 13.23]>>stream
+xPpuVpb
+endstream
+endobj
+177 0 obj <>>>/Subtype/Form/BBox[0 0 83 14.06]>>stream
+xPpuVpb
+endstream
+endobj
+78 0 obj <>>>/Subtype/Form/BBox[0 0 91.44 13.77]>>stream
+xPpuVpb
+endstream
+endobj
+4 0 obj <>>>/Subtype/Form/BBox[0 0 297.52 12.53]>>stream
+xPpuVpb
+endstream
+endobj
+159 0 obj <>>>/Subtype/Form/BBox[0 0 81.86 14.06]>>stream
+xPpuVpb
+endstream
+endobj
+34 0 obj <>>>/Subtype/Form/BBox[0 0 91.38 12.78]>>stream
+xPpuVpb
+endstream
+endobj
+60 0 obj <>>>/Subtype/Form/BBox[0 0 83.74 10.87]>>stream
+xPpuVpb
+endstream
+endobj
+32 0 obj <>>>/Subtype/Form/BBox[0 0 90.82 10.87]>>stream
+xPpuVpb
+endstream
+endobj
+165 0 obj <>>>/Subtype/Form/BBox[0 0 82.71 13.92]>>stream
+xPpuVpb
+endstream
+endobj
+179 0 obj <>>>/Subtype/Form/BBox[0 0 82.22 14.06]>>stream
+xPpuVpb
+endstream
+endobj
+10 0 obj <>>>/Subtype/Form/BBox[0 0 91.39 10.86]>>stream
+xPpuVpb
+endstream
+endobj
+119 0 obj <>>>/Subtype/Form/BBox[0 0 90.25 13.42]>>stream
+xPpuVpb
+endstream
+endobj
+163 0 obj <>>>/Subtype/Form/BBox[0 0 82.86 14.56]>>stream
+xPpuVpb
+endstream
+endobj
+70 0 obj <>>>/Subtype/Form/BBox[0 0 83.66 13.54]>>stream
+xPpuVpb
+endstream
+endobj
+141 0 obj <>>>/Subtype/Form/BBox[0 0 83.65 13.14]>>stream
+xPpuVpb
+endstream
+endobj
+197 0 obj <>>>/Subtype/Form/BBox[0 0 81.66 14.06]>>stream
+xPpuVpb
+endstream
+endobj
+117 0 obj <>>>/Subtype/Form/BBox[0 0 89.11 12.78]>>stream
+xPpuVpb
+endstream
+endobj
+145 0 obj <>>>/Subtype/Form/BBox[0 0 83.36 13.28]>>stream
+xPpuVpb
+endstream
+endobj
+157 0 obj <>>>/Subtype/Form/BBox[0 0 83.29 13.14]>>stream
+xPpuVpb
+endstream
+endobj
+151 0 obj <>>>/Subtype/Form/BBox[0 0 84.85 13.92]>>stream
+xPpuVpb
+endstream
+endobj
+199 0 obj <>>>/Subtype/Form/BBox[0 0 134.21 14.06]>>stream
+xPpuVpb
+endstream
+endobj
+84 0 obj <>>>/Subtype/Form/BBox[0 0 92.29 11.7]>>stream
+xPpuVpb
+endstream
+endobj
+42 0 obj <>>>/Subtype/Form/BBox[0 0 91.66 14.56]>>stream
+xPpuVpb
+endstream
+endobj
+68 0 obj <>>>/Subtype/Form/BBox[0 0 83.8 13.55]>>stream
+xPpuVpb
+endstream
+endobj
+115 0 obj <>>>/Subtype/Form/BBox[0 0 89.26 12.78]>>stream
+xPpuVpb
+endstream
+endobj
+173 0 obj <>>>/Subtype/Form/BBox[0 0 82.78 14.06]>>stream
+xPpuVpb
+endstream
+endobj
+62 0 obj <>>>/Subtype/Form/BBox[0 0 83.59 14.19]>>stream
+xPpuVpb
+endstream
+endobj
+14 0 obj <>>>/Subtype/Form/BBox[0 0 91.1 10.86]>>stream
+xPpuVpb
+endstream
+endobj
+195 0 obj <>>>/Subtype/Form/BBox[0 0 82.35 14.06]>>stream
+xPpuVpb
+endstream
+endobj
+127 0 obj <>>>/Subtype/Form/BBox[0 0 89.04 12.78]>>stream
+xPpuVpb
+endstream
+endobj
+72 0 obj <>>>/Subtype/Form/BBox[0 0 84.16 11]>>stream
+xPpuVpb
+endstream
+endobj
+152 0 obj <>>>/Subtype/Form/BBox[0 0 82.79 13.14]>>stream
+xPpuVpb
+endstream
+endobj
+107 0 obj <>>>/Subtype/Form/BBox[0 0 90.47 12.14]>>stream
+xPpuVpb
+endstream
+endobj
+103 0 obj <>>>/Subtype/Form/BBox[0 0 89.33 12.78]>>stream
+xPpuVpb
+endstream
+endobj
+97 0 obj <>>>/Subtype/Form/BBox[0 0 14.7 10.87]>>stream
+xPpuVpb
+endstream
+endobj
+86 0 obj <>>>/Subtype/Form/BBox[0 0 91.51 10.86]>>stream
+xPpuVpb
+endstream
+endobj
+181 0 obj <>>>/Subtype/Form/BBox[0 0 82.71 14.56]>>stream
+xPpuVpb
+endstream
+endobj
+133 0 obj <>>>/Subtype/Form/BBox[0 0 89.25 12.78]>>stream
+xPpuVpb
+endstream
+endobj
+1 0 obj <>>>/Subtype/Form/BBox[0 0 297.52 12.34]>>stream
+xPpuVpb
+endstream
+endobj
+189 0 obj <>>>/Subtype/Form/BBox[0 0 82.14 14.56]>>stream
+xPpuVpb
+endstream
+endobj
+54 0 obj <>>>/Subtype/Form/BBox[0 0 82.89 10.79]>>stream
+xPpuVpb
+endstream
+endobj
+8 0 obj <>>>/Subtype/Form/BBox[0 0 176.89 10.86]>>stream
+xPpuVpb
+endstream
+endobj
+183 0 obj <>>>/Subtype/Form/BBox[0 0 82.57 14.06]>>stream
+xPpuVpb
+endstream
+endobj
+48 0 obj <>>>/Subtype/Form/BBox[0 0 91.66 13.42]>>stream
+xPpuVpb
+endstream
+endobj
+109 0 obj <>>>/Subtype/Form/BBox[0 0 89.05 12.14]>>stream
+xPpuVpb
+endstream
+endobj
+149 0 obj <>>>/Subtype/Form/BBox[0 0 83.08 13.78]>>stream
+xPpuVpb
+endstream
+endobj
+169 0 obj <>>>/Subtype/Form/BBox[0 0 82.43 15.2]>>stream
+xPpuVpb
+endstream
+endobj
+129 0 obj <>>>/Subtype/Form/BBox[0 0 89.53 12.78]>>stream
+xPpuVpb
+endstream
+endobj
+36 0 obj <>>>/Subtype/Form/BBox[0 0 91.17 14.06]>>stream
+xPpuVpb
+endstream
+endobj
+123 0 obj <>>>/Subtype/Form/BBox[0 0 89.32 12.78]>>stream
+xPpuVpb
+endstream
+endobj
+185 0 obj <>>>/Subtype/Form/BBox[0 0 83.07 13.92]>>stream
+xPpuVpb
+endstream
+endobj
+175 0 obj <>>>/Subtype/Form/BBox[0 0 82.5 14.06]>>stream
+xPpuVpb
+endstream
+endobj
+205 0 obj <>>>/Subtype/Form/BBox[0 0 157.86 16.62]>>stream
+xPpuVpb
+endstream
+endobj
+18 0 obj <>>>/Subtype/Form/BBox[0 0 90.61 10.29]>>stream
+xPpuVpb
+endstream
+endobj
+52 0 obj <>>>/Subtype/Form/BBox[0 0 84.31 9.71]>>stream
+xPpuVpb
+endstream
+endobj
+58 0 obj <>>>/Subtype/Form/BBox[0 0 83.88 12.07]>>stream
+xPpuVpb
+endstream
+endobj
+171 0 obj <>>>/Subtype/Form/BBox[0 0 82.92 13.77]>>stream
+xPpuVpb
+endstream
+endobj
+121 0 obj <>>>/Subtype/Form/BBox[0 0 88.83 12.78]>>stream
+xPpuVpb
+endstream
+endobj
+93 0 obj <>>>/Subtype/Form/BBox[0 0 5.75 5.11]>>stream
+x+T0Bc=sS ahP` E
+N!
+Q.I
+
+!i@ qC]=S KKB!$WAB3$K5D!P :q
+endstream
+endobj
+135 0 obj <>>>/Subtype/Form/BBox[0 0 89.1 12.78]>>stream
+xPpuVpb
+endstream
+endobj
+64 0 obj <>>>/Subtype/Form/BBox[0 0 84.09 13.34]>>stream
+xPpuVpb
+endstream
+endobj
+56 0 obj <>>>/Subtype/Form/BBox[0 0 83.38 11.43]>>stream
+xPpuVpb
+endstream
+endobj
+28 0 obj <>>>/Subtype/Form/BBox[0 0 91.81 10.86]>>stream
+xPpuVpb
+endstream
+endobj
+147 0 obj <>>>/Subtype/Form/BBox[0 0 83.86 13]>>stream
+xPpuVpb
+endstream
+endobj
+12 0 obj <>>>/Subtype/Form/BBox[0 0 91.68 12.14]>>stream
+xPpuVpb
+endstream
+endobj
+137 0 obj <>>>/Subtype/Form/BBox[0 0 83.29 12.78]>>stream
+xPpuVpb
+endstream
+endobj
+187 0 obj <>>>/Subtype/Form/BBox[0 0 82.29 14.06]>>stream
+xPpuVpb
+endstream
+endobj
+16 0 obj <>>>/Subtype/Form/BBox[0 0 92.24 10.86]>>stream
+xPpuVpb
+endstream
+endobj
+131 0 obj <>>>/Subtype/Form/BBox[0 0 89.39 12.78]>>stream
+xPpuVpb
+endstream
+endobj
+111 0 obj <>>>/Subtype/Form/BBox[0 0 88.9 12.78]>>stream
+xPpuVpb
+endstream
+endobj
+143 0 obj <>>>/Subtype/Form/BBox[0 0 83.5 13.14]>>stream
+xPpuVpb
+endstream
+endobj
+208 0 obj <>stream
+x+
+* ,R
+endstream
+endobj
+209 0 obj <>stream
+xS*
+ R
+endstream
+endobj
+210 0 obj <>stream
+x+
+* ,R
+endstream
+endobj
+211 0 obj <>stream
+xS*
+ R
+endstream
+endobj
+212 0 obj<>/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<>>>/CropBox[0 0 595.22 842]/Annots[104 0 R 106 0 R 108 0 R 110 0 R 112 0 R 114 0 R 116 0 R 118 0 R 120 0 R 122 0 R 124 0 R 126 0 R 128 0 R 130 0 R 132 0 R 134 0 R 136 0 R 138 0 R 140 0 R 142 0 R 144 0 R 146 0 R 148 0 R 150 0 R 154 0 R 155 0 R 158 0 R 160 0 R 162 0 R 164 0 R 166 0 R 168 0 R 170 0 R 172 0 R 174 0 R 176 0 R 178 0 R 180 0 R 182 0 R 184 0 R 186 0 R 188 0 R 190 0 R 192 0 R 194 0 R 196 0 R 198 0 R 200 0 R 202 0 R 204 0 R 206 0 R]/MediaBox[0 0 595.22 842]/Rotate 0>>
+endobj
+219 0 obj<>/ProcSet[/PDF/Text]/Font<>>>
+endobj
+213 0 obj <>stream
+h[͒8rSb7 f
8&NyZŪцJ^?վߢ+/L $HXpO$_&Ξw{gOw&WʜkfΕ.JvrW综
+t--ؗ }Uwέd(s%]gԁAcO/eul6Ӷf%/E."[?O̗Lya*7V-lXۋ,Kuju9nV?[-a ut>d?_\f?¯ξ߇~Vb]
6Z@[#}_߉*7. A{DQ*JL73UK
+Jd$
+E#]ƹɥ(å AcJri[OB~P +blO> #b]SbY ϑ`)s.c EˀXiI]B$ˢd3knoMƸ UYQL i*Nr
+&jT\U4
+N th. b/U;PmvlywN?#g), d9DmQ zW
ԓ\ BҌ! i|'
XN`3:1A!
+E^$D҉"e Â}f=mvx`wԯ%p?X!ulY©q;6VX569UKM"+ )|e^Șcl
+4A u(
Td`NP܊4
4V\!⎆_%E4q"[KIZWſ,y^>7Jo ^=\|(a*zɩ2)iN8՛9EeSP9%a+i{1Jk|6=SiʶEқ
ED W<֠ ]|,70a_״ \ L8olR -۽ɾD0P1tU\\;"\ ^0M-:"Pqˍ~Xh6;͖GBmGׄ bk(2f 9 0@_z/*S
+))ܤP%R l&ꊤhlaIӦ,-5 8uWkR} }\ h9R1%ho
b[Лyri1ŗcPaQI#&Aw5!
DT'bjN;8&׳D%
+VųFOX_q*
*q 98՛9EmS8|UzSx>0 XJQHX"8ӛ9
qJsᾆ_` n糵ЭC2"q {f$-mH&9B2<-#PY - JUez|wvWȽet'qLkgz[:{o_ʶ |^݂|9Kh?Uo䏧sjSh&a3 3_ѿ~r֔N˴p`Δb鬉WbʊxrpNڞG@*5s?\w2W +` 1$'UpL UirXMq8IvGҁwH"WOg W
,%xvZ||-yk-g4H,$GK6̌fˡ^?/ʪMn;ֽIdkDd$!1k )' ʀ,l*Q)L 3Lj7Rc2> kU/0n`]0Mda*`݀ʣP`BQLFc)=6 /: ,
2,
L xh9RdfrṈXIhƒ[8>yjVIsB -dp*v "oEZ `x
i\s0=JȆ>GJ@j"
+ .FďZwhW@fXmק-%{Rfk/ &\(k;i}|p=Հq@.nǫITj,Dѭ,H]mQbm |Ud{zהJQ]iu_V.ngЮ7n UT>҂.ΕptGt@ygqAgCYx8@ד ɀcyI@?xn6Ϯ0lURV( }9҅pA
+L*
+k" R_Dxۼ',U@芔н E+,C/h:j Ή\0C- dD9 k8/1ҾAwVB`G79Tt 9ΕH_<B г :b}IVkV
+ְ%8췛G%Ba:Ɖ' ௦lBI ۸(_@ *-ҹg>Vq(%H f팹;0| y^ z$;W2 φ|qq4լ^qf+2tybznAp
+h'jjP$[Pia.Q닧RHqH 9 1W.'[X>k[c칥i('V' oc ] xBajfp&xYb.PTy :WUK3 j%jX7!DTffBľdr⥍}l:Wk(~i% ^ wM^$gřZ ;mHN.1 To=z7v.( e|]vg qOS1>P eʣJs 3y1Y/mJ`ΫWb251>[ˡw)(Kbݙ?dXo]~ |5[z#.Q$f2jHƽ
+x}'^_\ۿ | yxH&&J~@!gJ]uY"6 ߵCFJ]JEc *c^˶[Fk<;d#H[ު=%@k| UK7֝,
+nJ\a@-HM-vCt\OktMr7 [ OM$k<ҝ U1aEȧP//m`.P ^ZE( F[B4K84`6N)1Dۅx6spm
+ lFb& 6a-ax]hBVaiw 3ntrQݝ4k N5 b`WK :qtcVcMh_6hT^Wfܾ@؏ TN/g ; Px\Ç~?OO{=7=<>z/u0N R2 z k{~=O O,9g߂,X9xe<맧'f(<}<7ԑ1]8jI
+3V ? Aݡm v%ԐP\}2> + ȡmޔhDAģywn~~)X79"% 4|a Ph0b('6ՐXQ3En{ƴ9XjRjYء@n露 F͞iKa!|n (#N BWxLS$4; [2Yбe}P \'(&=_霨+* oO N m
+pjQ~zKb}G r P҅5h%@lcN/f(l@ҝQTc4 ɸ3b.ɩ*;j6uC"۽V:|,$ mMV× Fp ,%>1 z`=uWdGEm}FMSŃL&xrOda\ѺW Dj
+
+endstream
+endobj
+220 0 obj<>
+endobj
+221 0 obj<>
+endobj
+214 0 obj<>
+endobj
+223 0 obj <>stream
+
+
+
+
+ PScript5.dll Version 5.2
+ 2008-01-16T09:35:29+01:00
+ 2008-01-16T09:35:29+01:00
+
+
+ Acrobat Distiller 8.1.0 (Windows)
+
+
+ application/pdf
+
+
+
+
+
+
+
+
+
+
+
+
+ uuid:6ef5efc1-11ff-409a-a4ba-0fed66b53f00
+ uuid:6660edfb-9141-4619-9c31-6f458bf0cd39
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+endstream
+endobj
+224 0 obj<>>>/DA(/Helv 0 Tf 0 g )>>/Pages 214 0 R/Metadata 223 0 R>>
+endobj
+222 0 obj<>/ExtGState<>/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/XObject<>/Font<>>>/CropBox[0 0 595.22 842]/Annots[3 0 R 5 0 R 7 0 R 9 0 R 11 0 R 13 0 R 15 0 R 17 0 R 19 0 R 21 0 R 23 0 R 25 0 R 27 0 R 29 0 R 31 0 R 33 0 R 35 0 R 37 0 R 39 0 R 41 0 R 43 0 R 45 0 R 47 0 R 49 0 R 51 0 R 53 0 R 55 0 R 57 0 R 59 0 R 61 0 R 63 0 R 65 0 R 67 0 R 69 0 R 71 0 R 73 0 R 75 0 R 77 0 R 79 0 R 81 0 R 83 0 R 85 0 R 87 0 R 92 0 R 96 0 R 98 0 R 100 0 R 102 0 R]/MediaBox[0 0 595.22 842]/Rotate 0>>
+endobj
+239 0 obj<>/ExtGState<>/ProcSet[/PDF/Text/ImageC]/XObject<>/Font<>>>
+endobj
+216 0 obj<>
+endobj
+217 0 obj<>
+endobj
+218 0 obj<>
+endobj
+236 0 obj<>
+endobj
+237 0 obj<>
+endobj
+233 0 obj[/ICCBased 245 0 R]
+endobj
+240 0 obj<>
+endobj
+241 0 obj<>
+endobj
+242 0 obj<>
+endobj
+215 0 obj<>
+endobj
+225 0 obj <>stream
+HVKnFϦwl CY` >ɜ#'5rlRlRM92$SOWWzUg?~e3FgY&`ٷQc `4st\l9ٌ>E,~%kXsA*) I0o
lc`a*qW7VNg1>pG'>F1hS ϗlV,%ԉ-MTIBK@|2$:0O-'U-wXКeW pCڮ uASjҌ&u?rHZGeq܁ K" [o])H*k)@4Rhm`8]c(,bǘ$]BG~pK/: G
ʂVF;֭¥D?#Aszo
+ -!$l'݅ORHN/<$5Zl
ۿ2߮nh+(zр7PY =bUʀ C!Ljݨn c1-nu)n1᭐EJ'.B h CgH`i b ,F?(ZM5 X:UR+@KŬbOU<6w:RJ) &
DfK Lp ?F۳iFS6FtX>W7G<߁QC|1Es@?%2)f_)7tB}
b#5q 8|b\F`zU{Fw&1% OySfr&tZwZ,d AԐF-sL O]|;<ܳz1ƧOw]h 13ٙ
8]7/Rsqjc~U;&{ bif,\@f ]US]~dHUa?&54W+iGJg @ E'gk7{)o!֓BboGty6߯*\ +nYL#[ NVH8ڝ}W!Ow`
+/ 2ұ3v z*NC 9 hF!y|q g+V ݬc_z|VO b ^X;mzE)hOlRZP+ \䴪Čup`/8R{r|&meUV~]&V>~@WԀ""F=:dPx0}t +_
+endstream
+endobj
+235 0 obj<>
+endobj
+226 0 obj <>stream
+HVKo7ﯘ[hEܠ(=XRW
+r$mmͿ7j @a3oWd ( #])#(eiBQjs)ԬjZF4l
+,y 5ytjݯiURd2m2Y&U2Gn8ֱW(uR:(Kw
+` f{Sq5-v?YwϷ \|w`""G]D?=;g3UM S녬rr.X&0Fx#ge>f:@avcП* NUsK;ÀuS-W6r%5[Қ!m*ea//8'>'L\*~T. !n\XiĦ\+Ԃ6- ڿ:6}XF{ 5?qzKfR]*H\q];;
+
u6۴˅ƕ\wcZucIp9_9KtɭԔo&HR kq1[ S)ʖy D ߔP*rVV?dQ |s_A-N@4>uHsg!+OΑ3ꌬG6,% Hs
( k-֫.3YW%vjnOӷ
ۦBVbPw,@j11]nh
+43Iy\ \dTPk9aQ;'Ǽnv8F{i6f 2 ᦽ,&jNs̠x)nTYۊeV+C} l`ơaQdBB1Cۦj9<M~"_ew1ۃG |x&ޜ6 e:1^s8=6Dbv7-;P-YuaGN?lߴ5b|}2hkG"3yX$9MTv> 5{L#<2q˵yf~XW7y W"(~B`X>mA=v¾ݺiOxF[w{lL.W]x?7Z ڞߩFa͍~]ϓ]w# Fn8/T5>L-N,/iMT=+i ]ּ|H NѦ-IϭY?_jɈ` ]
+endstream
+endobj
+227 0 obj <>stream
+HW͒6 )pQ\:t6lZ[QƖIn} oQdIu&H 1I!+'9ƭq&8]36V94}54>t_0S
p_u;f[ YXoA:͌
+f-8z qùO+D\
0AEj}xV0p2pƈEiΤrMőz
p4
+J[z7xə ܠ֎
"bwB/J;2aK Gޞ3@#O B2A=Diô }kcܕF~yDO^|$na0S` )& İ 2h6qk5] '\Q>,х@g!rN(>G
Y1;:RþLنPcB植ԇW/7~r墘 K,:Kt)\
+y' rTT(&X=-ޘ#
R{`JIը:Lȯ.+"tL c?Vve{~;{"dT:)Ð*h `wTiuXjqA+^n%gh2= c {-S8Tz$fzl8ZKpxWp!y iXE`GH ʏ+X$*Qޜ33k \{i3bG.3'P#/<ώwʍ] L1rgMIHi/p<{ѐn*%A; _VP$[~,ɜ2dFaV(}@:ϛ(lzjQnؐ26$K|J &^,F1j31.[vpU&
+GrYXQߐ!R+7?h_[ڬof-3QO-"BL /Ev>Gڞs[|BCfto| W7C%P>23Xg==aWY@Wÿ~rPX prݠs]xƷX0N~3w
+endstream
+endobj
+228 0 obj <>stream
+HVMO0WT [ J8 *aQew ?όlwQ4`?~j+;Nv҈nUHE)w 0U&(Hi;zp:@#&j)1j%8 9t -H:jX'i۶Mi Ogc\
iUUOINag'\3X^(TBK͏uPݸ:'W N2&U%*Z]W-Um,6OϢK"x`&ZP\T54e hB,7
+Z3$<1㠻q}Ƒw0Ⱥ8 /(s%o}b6 |&t}Eҡ sPiLcBasw?ޒ+;?-1oL"4|i&BnJ"1Z k ȕ~,IO}ҥI<g0V$U:ej!06A $?i#$TJP;*5T32Ih2+gsqU6&&VM ThM ^5`V/ПK>:0[ZeY% kI INPwH}gNۭ<&|?K:5̻)v&n/oG7zq3|moyJ_&d9ҡ&g{>dit&Un>c| ꋾ
+endstream
+endobj
+229 0 obj <>stream
+HVnF+fruzg3l @ h02I\yMR$-g[-]Uu p!d:Ya$
+Vl0tƧ?eK[upb5K}bݥkc~EkE iOCYO$ Do T/}p'}b2L[Ì\އ}R(. F~c"697w2]0芀
MC'Fq+CZ&z~qً=7εb
+j
'ԀѪ I m9Ht]ijtnNM9 q? sW5-l*l(.
+!SM[ʈm. Iv͡
+X;Ͷq*Vf%Cүo\apؾ?^w{hj 5$m?ĥ!8CfϸVkøn9p1"Zi#r/-"^pII18b90 5~Jb+9>%QoMlL2
Klm풷oy#I`[Nb{ ^apQNǦ9utOq ڏnekPAS3|*d@O2R
+cG
(}p
!
+톝Exl(^;>Γ.̌jA>-MB?ClrB|td1] z>*
+ME3Q14(nްob]äMe*}lӎJg*BjJYV" R{"3Im
+#0d".Q:IXQ@ B3zA5B,4Sg0b䬻 Ca^LDf!b%^lx |"Tв(4 PpJӢuY.x2/R \PtE_%:+&"R\k/ݟO^sjK}l7R4Sx|wh +=^}7 !S}y/ EsқM덨"+W%C,9n=OZ-BD}BH`>/;ᅾDaW_D)*f2_
+endstream
+endobj
+230 0 obj <>stream
+Hn0E
+nP̒ÇZjW8ibزD
X2ř;3"G殠J2l&Rઉ5"(+~RYA.˙VǕb[1m ע6Ұf Pg Oi S!Jh VFZ&sLyk㒍"A N p]ʼnǒ[a)JRS_ F!Hô>8.j*?仙d{sW|/>7CU zpZTw(AB%NV+n TO*X,yK_ !._J
+_:sN?(ěxl2 XC/3ʡh:# @It ' cC&]2$tEWյ 8QHetN ;HXΎ`p"0 ggkQMCKK:M¸uOO$?49ޜjNOi Ca`x]ut'u.<,}bM8Z5alǤ0E*Ľ8 ySm$=֊ K+j
nn29e L&o$UM2.q9-1CZ JwFTJ'_GGV_2#3 bHusKUse.# Y?F# Cjjzlj{/ fW-`vZ #US"BrkmlWُ=H _SD x8{:pżRBJ >
+endobj
+231 0 obj <>stream
+HV˒6+pI-GX ^sK*rIoq\뢋vI*6WED\ʖ[%`= fI9"d$[V(BOvĭd7. A)ޢ"Ҹ+jFE: j}H7 ,jѝ%WQda
+L_C{@ڣ;8GaDgj :b 0
+endstream
+endobj
+232 0 obj <>stream
+HV͎4)6Bc;\!EN3IG-[Pe{ 窯;
Rh[ht˔5֊q?km{xN 9$5 vm}SpSnHrŝяH#a ?"gԸjUsӊ}[D8F7^Vpℚ/W#q+٠'Wh1B8(έeA[('R2RfK5JɅAc}Jry6i}aЩO=,6p>eE_ yoNAW.Bmg@rIڥW*0j)8r+#
+> *),$eO
b)pcn)Wv
KDpk,&֚Dk}}9wP վު%*!g)Q3(}yh+8<]^om,m]_MYh& r5K9M5{V^!IDri(0!O)@ 6kitK
+HY[ u]wC羂z }?59zZ j7%̖
X>>ƃSufFkDQ2@Pǡ& *CSR50їoUp k^*$DRD)*r43\2Vk ]_{%
{x2},P ;1_]\ zj"1d{M9ӸCZ27O Kt N>oc9I͕Ib([P`ŝl2%9gJ" !aBa?;H`a 8'^dVDѡ͇j,.gY ka
,Xz{!"Ɍk!}(܇ƍ]G6 Ц*+tLr<;%sX+,fv&Y_6p+bT̾^1
+ zuݹpsky_*
+ SXl0zbU*3 vc 8 }!AoWd 1 *45{ n\әjF~)+M\Lh7 8jh z 9U&AoGh{!G I
+
+endstream
+endobj
+245 0 obj <>stream
+hޜwTTϽwz0z.0. Qf Ml@DEHb!(`HPb0dFJ|yyǽgs{. $O ./ 'z8WGб x 0Y驾A@$/7z HeOOҬT _lN:K"N3"$F/JPrb[䥟}Qd [Sl1x{#bG\NoX3I[ql2 $ 8xtr p/8 pCfq.Knjm͠{r28?.)ɩL^6 g,qm"[Z[Z~Q7%"
+3R `̊j[~ : w! $E}kyhyRm333 :
}=#vʉe
+tqX)I)B>==
<8Xȉ9yP:8p Lg kk Ѐ $t!0V87`ɀ2A.
+@JPA#h'@8
.: ``a!2D!UH 2 dA>P ECqB**Z:]B=h~L2
5p N:| ó@
QC !H,G6 H9R ]H/r Aw( Q(OTJCm@*QGQ -(j MF+
6h/*t :].G7Зw7 Xa<1:L1 s 3bXyeb~19 v Gĩp +5qy^ oó|= ?'Htv`Ba3BDxHxE$Չ "XA P44077&9$An0;T2421t.54ld+s;#
V]= iY9FgM֚k&=%Ō:nc1gcbcfX.}lGv{c)LŖN퉛w/p+/<j$.$%&㒣OdxTԂԑ4i3|o~C:&S@L u[Uo3C3OfIgwdO|;W-wsz
17jl8c͉̈́3+{%lKWr [ $
+llGmnacOkE&EE Y2⫅;K,KhtiN =e²{^-_V^Oo§s]?TWީrjVQ=w}`嚢zԶiו 8>k
+
E
[ly邟~_ Y53rW^{7so }x>|쇊z >yz
+
+endstream
+endobj
+234 0 obj <>stream
+ Adobe d
+ $$''$$53335;;;;;;;;;;
%% # # ((%%((22022;;;;;;;;;; SW" ?
+
+ 3 !1AQa"q2B#$Rb34rC%Scs5&DTdE£t6UeuF'Vfv7GWgw 5 !1AQaq"2B#R3$brCScs4%&5DTdEU6teuFVfv'7GWgw ? TT 6a:z`-FʇtVHo 9C~)\WVӳܞ{r(m
q&lF_rYyT"xF/2)R\Uv5 9xv ]"0A>gx
XRI$Q !O}mJ?c ) ϶_<̌.o~}j1_P>gdՂ(qڭ ;$m%Sv n^NéL6&N~N=w#;uU[+,eMqh]c\\H%:ͽ7$cS][[Z 닶5sZctm7&uD3myS$:^E=OQSוm@2K9P mFF# ֪Ss3Mb#vJzt1~vX`YUTUkP͎?l =sֲ,]M]sMt5IOZ:WX C 4>_qZ.k][,5ex;:E߷mǸ>lzpsnᦲu%=Ksv]y9.2}"4wU{:.}w;=3@f g)R\k9U:~w.r.JmpԳ:=t]nMT~UA fYy.sdgʚN5} _Kv&GRyu;pae#9嵃۲JzI%)$IJI$RI$I%)$IJI$RI$ N/<-ȵԇzN P,kjy^?Y?h^^]C堹n{! (9 1%(5se(76Qb_]^ѣ9:8^_כJcl ^LZK\Da}u M,[>Q2@O2ь<:cow:SFYrqn8b -߭]W.qz ln뙓0L{+.2t:WԶuJIkXrkuUH Kt: 6f ەj5=$2UGM+'_lJY3K } +GX6 e w6ֲ&v5CǹW{>kpDT@|Kd92fg䀨ƴ J?c ) ϶G,r ?ն5Ooԇ92 {lorW#d˺ƼdUCKvmquzf m^[kݲ]kXcW u hW#ｮ~3ŵٳW=80BJobu46vMf> ,k5_rKmy[{JθzϢCje4}=;W_MxG6[ 5n?rJiftO[1yV`/ǵ-e 'BW0ft_elw~hE %:c4ՇqkEH{Ul agqzid,hpFSks3mη9ckFSa3;c6Zze?x5Ū=w ,}O-f4n=9M~Siƾʝ}Yls:Kdw
ke%2\zC6g6[[Y[VMTsfdYcnC)k +1}R:0knٌ2x `Yj z9餝ֽk\k/u{Z`AZsβYu4; 8ǒ6~n?O4GVoRçcQe d۶C_194bux7'=6 ji'hIcrkƣa Fff=챶l#pc44Offf_U8C ̃hX.INJQ-6>Ց^0MBY Eu,NX\skœ} ǞIgYlNv&>9*7&6}ؔ럐n@'oim
]%3r01q,~AL˅{X~WF ƽ6FjJuRX'% S >s4n#
pGb.*0:#[hkx
inINK Yr]oPdtKd eU.hJWXSw'p:mk@=Ғ]q8O솇;?I5 Na }Q'3ff $G$e%νo ޝ:Ƌ G
)$O?ƴK:*
:sYWOb3 m{+e s \B*>汪dDmcGhࠖ)k![\cv{ˆ|YL9qy5 6ƞN8^Uc ǻsΝ_yrl{8)"
nh-:/3+r˛m@V {X~ Pd =#q0' ?x֏sGGW ӣǶx嗗-znSLS{E ı:_Jͯ+奤od^ծ+:7ռ[{]c-s6č kt r #p=|#JrlxL|Q?K,e~sX l |s52kCUVƚڶC+7q,kX\XFƍA\\YNC_X݅psƗ8I: Vum +xcdx FyٽzS]y*vU4;7tE;< -[ ~|%%p6:ynNzFKĥiuv
n2a% n>,=6]s\ ~kc 1.qSIwyΉ3_[K ӂgƾoG5||~ Ʃ0 + ;ӭE%u[]Mc K q̔ͺZZm=a$ѫ]=Mmg 57`ǒħzvWGf5U3&܉}Wc-WPHp?bte5b ^+xk ǵOBP^>~nS3jd[&9747R˫n5]C DAc}Gzn.N>^q {Zslh ee ũFS=t-P& v
+Wje^GvX1qeݒKCG 꺴ScbN4ceaaßVۚBYҳznOO a+)so,;2A[$ԯj˘:\+P&$ 6t1? hə S IO+/SMT]Keߢ{kj ?ݩ.$[e[m v;-ӬyFDHЮ}KfWNȿ/#"6</p<@1v#(fs_{.]:ۜӱ?Z>%yGJ=F^wo 3%
+8;\V=ush%zL鸽/
+#沫ʻl߁Mymtb c!$4o&t]<$Zӡ ΆS ,}XqFq{=Y}zfK KM cœ ;ոѨ NkA$ ne#8J# XIm Z}Fbl+ʦcȒ #~`7Q[iuU@Yc,s6 FAռ.0cDu:rQ %ꄵkӨyӗޣFM7f ieK@=>V^Ex&溲2-
+\Z8ouz K^bK[~ V=X}iHF kf2sXba1 +z8WFoXYVK[uD!봏 K*v63Uً_^F{tA ^PZdOpx QVt Sg Z_Y [,ic : TZ9>$TYq 6j#R<]C' Ҍ >m5lmlml ց )$ģ 9BjX/ S m[i)XFV{ k;wN%g 3V {g m
k5G "\D2qqrkm;\'Q hN}=UKiePxdI߷V.c #8bR>E>;R ܜN=S48acv ?;RzvwR8Xx]2^Y$Li}g+&1kz9=Ŧ:vnH@
|j tDn[ř42m}ʈ|#$'\1 EqN oǶ1 [26DwK/`3r(}ut=\mmns^7Zuzk GDyx u>lm'!.}v{Njܳl_QѹKFtAQֽu 18T
q
wmY K_ C_ΉUk[U `cFwsxGH x8MWs}L&CY*}=RÑk~;;`kl0ݯ$ ж[XmM .t#㸠͆v3
.8 'xUgK"kC kǤ wﶧZ-`tm-n 6.>-~=mN֎I.r2D
+I$XI%)$IJI$RI$I%)$IJI$RI$I%)%I)%I)%I)%I)B ^?` >ڶʩ$ꤗʩ$ꤗʩ$ꤗʩ$ꤗʩ$ꤗʩ$ꤗʩ$ꤗʩ$ꤗʩ$ꤗʩ$ꤗʩ$ꤗʩ$ꤗʩ$ꤗʩ$ꤗʩ$ꤗʩ$ꤗʩ$ꤗʩ$
+
+endstream
+endobj
+243 0 obj<>
+endobj
+244 0 obj<>
+endobj
+248 0 obj <>stream
+hX
pTu>] $T䘷V? E
+$
d+,e\W"Ujř8mp # aGLCIDq;k2Τ'Mƨ}o";L w=s9>##VXT-=K%'O,"eCkg}$Rmo_q@ϵGB9D
E"痉~Kk*a t8k eb7ttyfzCQMZga+{>L.[QmgQcqbNqE?̇/J\T3uZQq T(FX4զg5&Ξ`aM>E|3.RPNQMwhO*b+2(֠* h@a ACQg$ҫbMBNHԵ (GЏ{WkMUEv,-O% nYKץmTޣ4G{DBUK;QU/*ySڵQYz4I?uf*cU
+],.v\E ;Z]a}`\93W_=o; :9 wPSL)[YIՠ&.~4"]HطTV\C_a'")Ze]٧ Pgpi5JHݨ Rc['Z-kZzSڔ~ڱ; o]~ZBK/Ii2ijSF ;O:,h %?^4 zy)(MKǕ|uOtJՂ{#q]+f[~vo g
Kv+wt ìtOx&R֯<'%r};LJZʦTZNpp֯[zUʒBϊ/,|A-e.c͟)o .ZpAjӡk"KQ] 4̂)m+cwui@U=41 kw=qo$aҎ^י%s3?Zh]A#Ј5WaUՇ.nA[1Q =fCwYmн5^=Hn
tgӐZCCk)$ջNE,!~ i_x5>VQ̿Ɯ :,wk7`<<o3
8"kֹGm.?YM]ғː~kl ݡO7 |-,8UOsk9I$6쿞9C4! ؒ_
+HԢo7QCff/ٶ
+ih6;aoy=k66mYͼ6+&Ll3f{; ^^ 73 phv[1e )`6;fglVe-6fmLyooKm,0 m Yu[
>
>
c`Tl#.m0
[e߬ߤ/s =Kzu]e8"5V:B 5/ٰT̬\s䇭/q63ؗ 爱G%y @9r{R4WiK m#vPh-m.;SOBϑ.}/GuTm1D=$eq' W;iR鉹N,Q.F,C>UIY2'~L &eF9-dzV,J^UȻFq畱xG[{q(-+[UZc{GK<k6*cbcK4j^]ƎHW$ V FSoghEwwu5Z~,_eumyvvk ]E;"m ojPcuX[x( 1b7DnTI1AmNdI-.UTB >-QjqD( vFzp[ʹJkB&2q 1: CBhk Aka5Um >˚цu¬]?߄D7l0:qUgR`@/!!Dh5wtb>{b֬.OOX*Z( R˻vG퉧NtUӭG }M{Z]zƓO
+0 s
+
+endstream
+endobj
+249 0 obj<>
+endobj
+246 0 obj<>/FontDescriptor 249 0 R/CIDToGIDMap/Identity/BaseFont/ECFBNN+Wingdings-Regular/Subtype/CIDFontType2/W[134[891]]>>
+endobj
+247 0 obj<>
+endobj
+250 0 obj<>
+endobj
+xref
+0 251
+0000000000 65535 f
+0000041729 00000 n
+0000023106 00000 n
+0000000015 00000 n
+0000032719 00000 n
+0000000234 00000 n
+0000028438 00000 n
+0000000461 00000 n
+0000042501 00000 n
+0000000690 00000 n
+0000034521 00000 n
+0000000917 00000 n
+0000048470 00000 n
+0000001145 00000 n
+0000038900 00000 n
+0000001374 00000 n
+0000049243 00000 n
+0000001603 00000 n
+0000045593 00000 n
+0000001832 00000 n
+0000029680 00000 n
+0000002058 00000 n
+0000025303 00000 n
+0000002287 00000 n
+0000028181 00000 n
+0000002516 00000 n
+0000027666 00000 n
+0000002744 00000 n
+0000047958 00000 n
+0000002973 00000 n
+0000028695 00000 n
+0000003202 00000 n
+0000033748 00000 n
+0000003430 00000 n
+0000033234 00000 n
+0000003658 00000 n
+0000044304 00000 n
+0000003887 00000 n
+0000030920 00000 n
+0000004116 00000 n
+0000031950 00000 n
+0000004344 00000 n
+0000037614 00000 n
+0000004570 00000 n
+0000024275 00000 n
+0000004799 00000 n
+0000031693 00000 n
+0000005027 00000 n
+0000043016 00000 n
+0000005254 00000 n
+0000025817 00000 n
+0000005483 00000 n
+0000045850 00000 n
+0000005711 00000 n
+0000042244 00000 n
+0000005937 00000 n
+0000047701 00000 n
+0000006166 00000 n
+0000046106 00000 n
+0000006395 00000 n
+0000033491 00000 n
+0000006624 00000 n
+0000038643 00000 n
+0000006853 00000 n
+0000047444 00000 n
+0000007082 00000 n
+0000025560 00000 n
+0000007311 00000 n
+0000037871 00000 n
+0000007540 00000 n
+0000035294 00000 n
+0000007768 00000 n
+0000039672 00000 n
+0000007997 00000 n
+0000024790 00000 n
+0000008224 00000 n
+0000027409 00000 n
+0000008452 00000 n
+0000032462 00000 n
+0000008678 00000 n
+0000030405 00000 n
+0000008905 00000 n
+0000025047 00000 n
+0000009134 00000 n
+0000037358 00000 n
+0000009361 00000 n
+0000040956 00000 n
+0000009588 00000 n
+0000027107 00000 n
+0000024209 00000 n
+0000030194 00000 n
+0000009813 00000 n
+0000009870 00000 n
+0000046879 00000 n
+0000029211 00000 n
+0000010101 00000 n
+0000010158 00000 n
+0000040700 00000 n
+0000010392 00000 n
+0000029422 00000 n
+0000010619 00000 n
+0000026333 00000 n
+0000010840 00000 n
+0000040442 00000 n
+0000011063 00000 n
+0000029936 00000 n
+0000011294 00000 n
+0000040184 00000 n
+0000011525 00000 n
+0000043273 00000 n
+0000011756 00000 n
+0000049758 00000 n
+0000011987 00000 n
+0000031435 00000 n
+0000012217 00000 n
+0000038127 00000 n
+0000012448 00000 n
+0000036067 00000 n
+0000012679 00000 n
+0000034778 00000 n
+0000012909 00000 n
+0000046621 00000 n
+0000013139 00000 n
+0000044561 00000 n
+0000013370 00000 n
+0000031177 00000 n
+0000013600 00000 n
+0000039414 00000 n
+0000013831 00000 n
+0000044046 00000 n
+0000014062 00000 n
+0000049500 00000 n
+0000014293 00000 n
+0000041471 00000 n
+0000014525 00000 n
+0000047187 00000 n
+0000014756 00000 n
+0000048727 00000 n
+0000014986 00000 n
+0000024532 00000 n
+0000015217 00000 n
+0000035551 00000 n
+0000015448 00000 n
+0000050015 00000 n
+0000015679 00000 n
+0000036325 00000 n
+0000015910 00000 n
+0000048215 00000 n
+0000016141 00000 n
+0000043531 00000 n
+0000016366 00000 n
+0000036841 00000 n
+0000039926 00000 n
+0000016597 00000 n
+0000016669 00000 n
+0000016895 00000 n
+0000017121 00000 n
+0000036583 00000 n
+0000017171 00000 n
+0000032976 00000 n
+0000017401 00000 n
+0000030662 00000 n
+0000017632 00000 n
+0000035036 00000 n
+0000017863 00000 n
+0000034005 00000 n
+0000018094 00000 n
+0000026849 00000 n
+0000018324 00000 n
+0000043789 00000 n
+0000018551 00000 n
+0000046363 00000 n
+0000018783 00000 n
+0000038385 00000 n
+0000019014 00000 n
+0000045077 00000 n
+0000019245 00000 n
+0000032207 00000 n
+0000019475 00000 n
+0000034263 00000 n
+0000019704 00000 n
+0000041213 00000 n
+0000019934 00000 n
+0000042758 00000 n
+0000020164 00000 n
+0000044819 00000 n
+0000020394 00000 n
+0000048985 00000 n
+0000020624 00000 n
+0000041986 00000 n
+0000020854 00000 n
+0000027923 00000 n
+0000021084 00000 n
+0000026591 00000 n
+0000021314 00000 n
+0000039156 00000 n
+0000021544 00000 n
+0000035809 00000 n
+0000021774 00000 n
+0000037099 00000 n
+0000022004 00000 n
+0000026074 00000 n
+0000022238 00000 n
+0000028952 00000 n
+0000022468 00000 n
+0000045334 00000 n
+0000022705 00000 n
+0000022938 00000 n
+0000050272 00000 n
+0000050354 00000 n
+0000050437 00000 n
+0000050519 00000 n
+0000050602 00000 n
+0000051397 00000 n
+0000057138 00000 n
+0000065787 00000 n
+0000062724 00000 n
+0000062884 00000 n
+0000063570 00000 n
+0000051286 00000 n
+0000057076 00000 n
+0000057113 00000 n
+0000061736 00000 n
+0000057200 00000 n
+0000060817 00000 n
+0000065864 00000 n
+0000067329 00000 n
+0000068591 00000 n
+0000069774 00000 n
+0000070716 00000 n
+0000071900 00000 n
+0000072945 00000 n
+0000073981 00000 n
+0000065058 00000 n
+0000077856 00000 n
+0000067205 00000 n
+0000064291 00000 n
+0000064897 00000 n
+0000072780 00000 n
+0000062504 00000 n
+0000065094 00000 n
+0000065337 00000 n
+0000065565 00000 n
+0000085603 00000 n
+0000085837 00000 n
+0000075164 00000 n
+0000089628 00000 n
+0000089844 00000 n
+0000086076 00000 n
+0000089387 00000 n
+0000090093 00000 n
+trailer
+<>
+startxref
+90282
+208 0 obj
+<<
+/Length 26598
+>>
+stream
+q Q q /GS1 gs BT /TT2 1 Tf 7.98 0 0 7.98 42.54 820.28 Tm 0 g 0 Tc 0 Tw ( ) Tj /TT4 1 Tf 7.02 0 0 7.02 233.94 812.78 Tm ( ) Tj /TT6 1 Tf 7.5 0 0 7.5 378.48 812.54 Tm 0.003 Tc -0.0008 Tw [ (R) 5.2 () -0.8 (serv) 15 ( l'administration ) ] TJ /TT4 1 Tf 9 0 0 9 233.94 799.7 Tm 0 Tc 0 Tw ( ) Tj /TT6 1 Tf 7.5 0 0 7.5 272.82 798.5 Tm 0.002 Tc 0.0002 Tw (Date ) Tj 0 -1.144 TD 0.0032 Tc 0 Tw (d'entre ) Tj 20.32 0.568 TD 0.0024 Tc (Comptabilis ) Tj ET 268.98 808.34 0.72 0.77997 re f 268.98 808.4 152.4 0.72003 re f 421.38 808.34 0.72 0.77997 re f 422.1 808.4 151.68 0.72003 re f 573.78 808.34 0.72003 0.77997 re f 573.78 808.4 0.72003 0.72003 re f 268.98 785.3 0.72 23.04 re f 421.38 785.3 0.72 23.04 re f 573.78 785.3 0.72003 23.04 re f 268.98 784.58 0.72 0.71997 re f 268.98 784.58 305.52 0.71997 re f 573.78 784.58 0.72003 0.71997 re f BT 7.98 0 0 7.98 202.02 772.4 Tm 0 Tc ( ) Tj /TT4 1 Tf 9.9549 -0.3834 TD -0.0002 Tc 0.0006 Tw [ (N matricule ) -3368.4 (TVA) ] TJ /TT6 1 Tf 11.4586 0 TD 0 Tc 0 Tw ( ) Tj 2.5639 0.015 TD 7.4139 Tc [ ( ) -7.5 ( ) ] TJ ET 268.56 779.78 1.5 1.5 re f 268.56 779.78 306.3 1.5 re f 573.36 779.78 1.5 1.5 re f 268.56 764.66 1.5 15.12 re f 339.48 764.66 1.5 15.12 re f 389.04 764.66 1.5 15.12 re f 573.36 764.66 1.5 15.12 re f q 164.743 0 0 39.42 31.86 780.08 cm /Im1 Do Q BT /TT4 1 Tf 7.02 0 0 7.02 196.2 780.08 Tm 0 Tc ( ) Tj 9 0 0 9 78 765.44 Tm -0.0015 Tc 0.0037 Tw [ (Recette Cen) -4 (t) -1.8 (rale ) ] TJ 1.7133 -1.1867 TD -0.001 Tc 0.0032 Tw (B.P. 1004 ) Tj -2.8067 -1.1867 TD -0.0001 Tc 0.0023 Tw (L - 1010 Luxembourg ) Tj 0.0133 -1.1867 TD -0.001 Tc 0.0032 Tw [ (T) -3.5 (e) 1.8 (l.: \(+) -3.7 (352\) 44 905 - 1 ) ] TJ -2.68 -1.52 TD -0.0022 Tc 0.0044 Tw [ (IBA) 26.6 (N) 0 ( L) -4.7 (U) 0 (31 1111 0114 1970 0000 ) ] TJ 2.5 -1.1867 TD 0.0007 Tc 0.0015 Tw [ (Code) 3.5 ( BIC: CCPLLULL ) ] TJ 7.5 0 0 7.5 113.4 699.8 Tm 0 Tc 0 Tw ( ) Tj 10.02 0 0 10.02 272.82 741.62 Tm 0.0004 Tc -0.0028 Tw (TAXE SUR LA VALEUR AJOUTE) Tj 9 0 0 9 433.68 741.62 Tm 0.0022 Tc 0 Tw ( ) Tj /TT6 1 Tf 0.84 0 TD -0.0017 Tc 0.0039 Tw (\(Loi du 12.02.1979\) ) Tj /TT4 1 Tf -18.7133 -0.6 TD 0.0022 Tc 0 Tw ( ) Tj 10.02 0 0 10.02 272.82 725.9 Tm -0.0002 Tc -0.0022 Tw ET 268.56 763.16 1.5 1.5 re f 268.56 763.16 306.3 1.5 re f 573.36 763.16 1.5 1.5 re f BT /TT8 1 Tf 7.02 0 0 7.02 272.82 690.8 Tm 0.0004 Tc 0.0038 Tw (\(Nom, resp. dnomination sociale\) ) Tj ET 27.96 697.34 0.72 0.77997 re f 27.96 697.4 170.16 0.72003 re f 198.12 697.34 0.72 0.77997 re f 198.12 697.4 0.72 0.72003 re f 0.602 g 268.98 697.64 304.8 0.48004 re f 0 g 27.96 666.8 0.72 30.54 re f 198.12 666.8 0.72 30.54 re f BT /TT4 1 Tf 7.98 0 0 7.98 46.62 683 Tm 0 Tc 0.0004 Tw (Dlai lgal) Tj /TT6 1 Tf 4.9474 0 TD 0.0006 Tc -0.0002 Tw (: dpt de la dclaration et ) Tj -4.2256 -1.1504 TD (paiement de la taxe au plus tard le ) Tj /TT4 1 Tf 10.02 0 0 10.02 70.08 656.48 Tm 0.0003 Tc -0.0027 Tw /TT6 1 Tf 7.98 0 0 7.98 202.02 689.96 Tm 0 Tc 0 Tw ( ) Tj /TT8 1 Tf 7.02 0 0 7.02 272.82 659.78 Tm -0.0002 Tc 0.0044 Tw (\(Rue, numro\) ) Tj ET 27.96 666.32 0.72 0.47998 re f 198.12 666.32 0.72 0.47998 re f 0.602 g 268.98 666.32 304.8 0.47998 re f 0 g 27.96 646.76 0.72 19.56 re f 198.12 646.76 0.72 19.56 re f 27.96 646.04 0.72 0.72003 re f 27.96 646.04 170.88 0.72003 re f 198.12 646.04 0.72 0.72003 re f BT /TT4 1 Tf 9 0 0 9 31.86 628.04 Tm 0.0008 Tc 0.0014 Tw (Bureau d'imposition:) Tj /TT10 1 Tf 7.02 0 0 7.02 121.62 628.04 Tm 0 Tc 0 Tw ( ) Tj /TT6 1 Tf 7.98 0 0 7.98 202.02 634.16 Tm ( ) Tj /TT8 1 Tf 7.02 0 0 7.02 272.82 635 Tm 0.0008 Tc 0.0034 Tw (\(Code pays, code postal et lieu\)) Tj /TT6 1 Tf 14.1026 0 TD 0 Tc 0 Tw ( ) Tj ET 28.08 641.54 0.48001 0.48004 re f 28.08 641.54 170.52 0.48004 re f 198.24 641.54 0.48 0.48004 re f 198.24 641.54 0.48 0.48004 re f 0.602 g 268.98 641.54 304.8 0.48004 re f 0 g 28.08 622.58 0.48001 18.96 re f 28.08 622.58 170.16 0.47998 re f 198.24 622.58 0.48 18.96 re f 198.24 622.58 0.48 0.47998 re f BT /TT2 1 Tf 7.98 0 0 7.98 42.54 619.34 Tm ( ) Tj 0 -0.5038 TD ( ) Tj /TT4 1 Tf 7.02 0 0 7.02 62.94 615.32 Tm ( ) Tj 9 0 0 9 33.96 603.5 Tm -0.0007 Tc 0.0029 Tw [ (I. ) -500 (Calcu) -3.2 (l) -2.9 ( d) -3.2 (e) 2.1 ( la taxe p) -3.2 (a) 2.1 (y) 8.8 (e) 2.1 (r ) ] TJ 7.5 0 0 7.5 345.42 604.04 Tm 0.0026 Tc -0.0004 Tw [ (B) 4.8 (ase d) 5.4 ('imp) 5.4 (o) 5.4 (s) -1.2 (itio) 5.4 (n) 5.4 ( ) ] TJ /TT6 1 Tf 8.864 0 TD 0.0036 Tc -0.0014 Tw [ (\(hors T) 6.4 (V) 6.6 (A) 6.6 (\)) ] TJ /TT4 1 Tf 4.848 0 TD -0.0188 Tc 7.997 Tw [ ( TV) -15.8 (A) 23.4 ( ) ] TJ ET 27.96 613.76 0.72 0.77997 re f 27.96 613.82 545.82 0.71997 re f 573.78 613.76 0.72003 0.77997 re f 573.78 613.82 0.72003 0.71997 re f 27.96 599.72 0.72 14.04 re f 573.78 599.72 0.72003 14.04 re f BT 7.5 0 0 7.5 32.7 582.62 Tm 0.0031 Tc -0.0009 Tw [ (1. ) -656 (C) 5.3 (h) 5.9 (iffre d) 5.9 (') 0.9 (affaires g) 5.9 (l) 0.9 (o) 5.9 (b) 5.9 (a) -0.7 (l:) ] TJ /TT6 1 Tf 4.98 0 0 4.98 132.24 586.1 Tm 0 Tc 0 Tw ( ) Tj 41.0121 -0.012 TD ( ) Tj 7.98 0 0 7.98 450 582.74 Tm 3.2936 Tc [ ( ) 2691.7 ( ) ] TJ ET 27.96 599 0.72 0.72003 re f 27.96 599 546.54 0.72003 re f 573.78 599 0.72003 0.72003 re f BT 7.5 0 0 7.5 39 568.58 Tm 0.0034 Tc 2.5988 Tw [ ( 1\) ) ] TJ 4.704 0.048 TD 0.0033 Tc -0.0011 Tw [ (V) 6.3 (entes ) ] TJ /TT11 1 Tf 3.688 0 TD 0 Tc 0 Tw ( ) Tj /TT6 1 Tf 0.888 0 TD 0.0022 Tc ( ) Tj 6 0 0 6 112.8 573.44 Tm 0.0038 Tc (01 ) Tj 7.5 0 0 7.5 121.2 568.94 Tm 0.0026 Tc -0.0004 Tw ( / Recettes ) Tj /TT11 1 Tf 5.928 0 TD 0 Tc 0 Tw ( ) Tj /TT6 1 Tf 0.888 0 TD 0.0022 Tc ( ) Tj 6 0 0 6 176.52 573.44 Tm 0.0038 Tc (02) Tj 7.5 0 0 7.5 183.24 568.94 Tm 0.0022 Tc ( ) Tj 6 0 0 6 193.74 568.94 Tm 0.0028 Tc -0.0006 Tw [ (\() 5.8 (c) 2.8 (ocher) 5.8 ( ce q) 9 (u) -1 (i) 5 ( conv) 12.8 (i) 5 (ent\)) ] TJ 4.98 0 0 4.98 257.52 572.42 Tm 0 Tc 0 Tw ( ) Tj 6 0 0 6 340.26 568.28 Tm 0.0038 Tc (03) Tj 7.98 0 0 7.98 346.98 568.28 Tm 0 Tc ( ) Tj 4.98 0 0 4.98 357.84 572.06 Tm ( ) Tj 7.5 0 0 7.5 453.6 568.58 Tm ( ) Tj 7.98 0 0 7.98 478.5 568.76 Tm ( ) Tj 6 0 0 6 485.52 568.28 Tm ( ) Tj 7.5 0 0 7.5 60.6 554.12 Tm 0.0031 Tc -0.0009 Tw [ (2\) ) -648 (P) 6.1 (r) 0.1 (lv) 15.1 (ements priv) 15.1 (s de biens ) ] TJ 6 0 0 6 179.34 554.12 Tm 0.0029 Tc -0.0007 Tw [ (\() 5.9 (a) -0.9 (r) 5.9 (t. 13/a\)) ] TJ 7.5 0 0 7.5 205.44 554.12 Tm 0 Tc 0 Tw ( ) Tj 6 0 0 6 340.26 553.82 Tm 0.0038 Tc (04) Tj 7.5 0 0 7.5 346.98 553.82 Tm 0 Tc ( ) Tj 1.448 0.04 TD ( ) Tj 7.98 0 0 7.98 448.62 554.3 Tm 0.0025 Tc (+ ) Tj 7.5 0 0 7.5 478.5 554.12 Tm 0 Tc ( ) Tj 7.98 0 0 7.98 485.52 554.3 Tm ( ) Tj ET 0.602 g 1 i q 1 0 0 1 354 566.96 cm 0 0 m 92.16 0 l 92.16 -0.48 l 0 -0.48 l f Q BT 7.5 0 0 7.5 39 540.14 Tm 0 g ( ) Tj 2.88 -0.064 TD 0.003 Tc -0.0008 Tw [ (3\) ) -648 (Utilisation priv) 15 (e de biens et prlv) 15 (ements priv) 15 (s de serv) 15 (ices ) ] TJ 6 0 0 6 284.52 539.66 Tm -0.003 Tc 0.0052 Tw [ (\(a) -6.8 (rt) -5.2 (.) -5.2 ( 1) -6.9 (6) -6.8 (\)) ] TJ 7.5 0 0 7.5 305.58 539.66 Tm 0 Tc 0 Tw ( ) Tj 6 0 0 6 340.26 539.36 Tm 0.0038 Tc (05) Tj 7.98 0 0 7.98 346.98 539.36 Tm 0 Tc ( ) Tj 7.5 0 0 7.5 357.84 539.66 Tm ( ) Tj 7.98 0 0 7.98 448.62 539.84 Tm 0.0025 Tc 2.8776 Tw [ (+ ) 2278.2 ( ) ] TJ ET 0.602 g q 1 0 0 1 354 552.5 cm 0 0 m 92.16 0 l 92.16 -0.48 l 0 -0.48 l f Q BT /TT4 1 Tf 7.5 0 0 7.5 39 525.26 Tm 0 g 0 Tc 0 Tw ( ) Tj /TT6 1 Tf 2.88 -0.008 TD 0.0032 Tc -0.001 Tw [ (4\) ) -648 (A) 6.2 (ffectation de biens ) ] TJ 6 0 0 6 144.78 525.2 Tm 0.003 Tc -0.0008 Tw [ (\() 6 (a) -0.8 (r) 6 (t. 13/b\)) ] TJ 7.5 0 0 7.5 170.88 525.2 Tm 0 Tc 0 Tw ( ) Tj 6 0 0 6 340.26 524.9 Tm 0.0038 Tc (06) Tj 7.98 0 0 7.98 346.98 524.9 Tm 0 Tc ( ) Tj 7.5 0 0 7.5 357.84 525.2 Tm 11.8262 Tw [ ( + ) ] TJ 7.98 0 0 7.98 478.5 525.38 Tm 0.6019 Tc 0 Tw ( ) Tj ET 0.602 g q 1 0 0 1 354 538.04 cm 0 0 m 92.16 0 l 92.16 -0.48 l 0 -0.48 l f Q BT 7.5 0 0 7.5 39 510.74 Tm 0 g 0.0034 Tc 2.5988 Tw [ ( 5\) ) ] TJ 6 0 0 6 74.82 510.44 Tm 0.0038 Tc 0 Tw (07) Tj 7.5 0 0 7.5 81.54 510.44 Tm 0 Tc ( ) Tj 6 0 0 6 340.26 510.44 Tm 0.0038 Tc (08) Tj 7.5 0 0 7.5 346.98 510.44 Tm 0 Tc ( ) Tj 1.448 0.04 TD ( ) Tj 7.98 0 0 7.98 448.62 510.92 Tm 0.0025 Tc 2.8776 Tw [ (+ ) 2278.2 ( ) ] TJ ET 0.602 g q 1 0 0 1 354 523.58 cm 0 0 m 92.16 0 l 92.16 -0.48 l 0 -0.48 l f Q 84.66 508.64 247.98 0.48001 re f q 1 0 0 1 354 509.12 cm 0 0 m 92.16 0 l 92.16 -0.48 l 0 -0.48 l f Q BT 7.5 0 0 7.5 39 493.94 Tm 0 g 0 Tc 0 Tw ( ) Tj /TT4 1 Tf 28.456 0.008 TD -0.0013 Tc 0.0035 Tw [ (Sous) -5.1 (-) -4.3 (t) -4.3 (o) 1.5 (t) -4.3 (a) -5.1 (l du point) -4.3 ( 1) -5.1 (:) 3.7 ( ) ] TJ /TT6 1 Tf 6 0 0 6 340.26 493.64 Tm 0.0038 Tc 0 Tw (09) Tj /TT4 1 Tf 7.5 0 0 7.5 346.98 493.64 Tm 0 Tc ( ) Tj ET q 353.64 506.3 m 353.64 492.32 l 357.84 492.32 l 357.84 501.5 l 442.98 501.5 l 442.98 492.32 l 446.46 492.32 l 446.46 506.3 l W* n 0 841.98 595.2 -841.98 re W n 0.898 g 353.64 492.32 92.82 13.98 re f Q 0.898 g q 1 0 0 1 357.84 501.5 cm 0 0 m 85.14 0 l 85.14 -9.18 l 0 -9.18 l f Q BT /TT6 1 Tf 7.98 0 0 7.98 442.98 494.12 Tm 0 g 1.053 Tc [ ( ) -1789.5 ( ) 451.1 ( ) ] TJ ET q 1 0 0 1 354 507.08 cm 0 0 m 92.16 0 l 92.16 -0.72 l 0 -0.72 l f Q 0.898 g q 1 0 0 1 354 506.36 cm 0 0 m 92.16 0 l 92.16 -0.06 l 0 -0.06 l f Q BT /TT4 1 Tf 7.5 0 0 7.5 32.7 483.8 Tm 0 g 0.0038 Tc (2.) Tj /TT6 1 Tf 0.84 0 TD 0 Tc ( ) Tj /TT4 1 Tf 0.936 0 TD -0.0018 Tc 0.004 Tw [ (Ex) -5.6 (on) -5.6 (r) -4.6 (a) -5.6 (t) -4.8 (i) -4 (ons) -5.6 ( e) -5.6 (t) -4.8 ( mont) -4.8 (a) -5.6 (n) 1 (t) -4.8 (s) -5.6 ( d) -5.6 (duc) -5.6 (t) -4.8 (i) -4 (ble) -5.6 (s) -5.6 (:) ] TJ /TT6 1 Tf 18.48 0 TD 0 Tc 0 Tw ( ) Tj 7.98 0 0 7.98 450 483.8 Tm 4.1733 Tc ( ) Tj ET 0.602 g q 1 0 0 1 354 492.32 cm 0 0 m 92.16 0 l 92.16 -0.48 l 0 -0.48 l f Q BT 7.5 0 0 7.5 39 462.26 Tm 0 g 0 Tc ( ) Tj 2.88 1.144 TD 0.0031 Tc -0.0009 Tw [ (1\) ) -648 (Liv) 15.1 (r) 0.1 (aisons intracommunautaires de biens des personnes identifies ) ] TJ 1.824 -1.144 TD 0.0029 Tc -0.0007 Tw [ ( la T) 5.7 (V) 5.9 (A) 5.9 ( dans un autre ) 5.9 (t) 0.7 (at membre ) ] TJ 6 0 0 6 202.86 462.26 Tm [ (\() 5.9 (a) -0.9 (r) 5.9 (t. 43/1/d, e et f) -9.3 (\)) ] TJ 7.5 0 0 7.5 250.86 462.26 Tm 0 Tc 0 Tw ( ) Tj 6 0 0 6 340.26 461.96 Tm 0.0038 Tc (11) Tj 7.5 0 0 7.5 346.98 461.96 Tm 0 Tc ( ) Tj ET q 354.72 474.98 m 354.72 460.64 l 357.84 460.64 l 357.84 469.22 l 442.98 469.22 l 442.98 460.64 l 446.16 460.64 l 446.16 474.98 l W* n 0 841.98 595.2 -841.98 re W n 0.898 g 354.72 460.64 91.44 14.34 re f Q 0.898 g q 1 0 0 1 357.84 469.22 cm 0 0 m 85.14 0 l 85.14 -8.58 l 0 -8.58 l f Q BT 7.5 0 0 7.5 357.84 462.26 Tm 0 g ( ) Tj 7.98 0 0 7.98 448.62 462.44 Tm -0.0022 Tc 1.3484 Tw [ (- ) -1045.1 ( ) ] TJ ET 354 474.98 0.72 0.78 re f 354 475.04 92.16 0.72 re f 0.898 g 354.72 474.98 91.44 0.059998 re f 0 g 446.16 474.98 0.72003 0.78 re f 446.16 475.04 0.72003 0.72 re f 354 460.64 0.72 14.34 re f 446.16 460.64 0.72003 14.34 re f 354 460.16 0.72 0.47998 re f 0.602 g 354.72 460.16 91.44 0.47998 re f 0 g 446.16 460.16 0.72003 0.47998 re f 354 458.6 0.72 1.56 re f 446.16 458.6 0.72003 1.56 re f BT 7.5 0 0 7.5 39 446.24 Tm 0.0032 Tc 2.599 Tw [ ( 2\) ) 1952 (E) 6.2 (x) 15.2 (portations ) 2600 ( ) ] TJ 6 0 0 6 120.3 446.24 Tm -0.0009 Tw [ (\() 6.1 (a) -0.7 (r) 6.1 (t. 43/1/a et b\)) ] TJ 7.5 0 0 7.5 163.2 446.24 Tm 0 Tc 0 Tw ( ) Tj 6 0 0 6 340.26 445.94 Tm 0.0038 Tc (12) Tj 7.5 0 0 7.5 346.98 445.94 Tm 0 Tc ( ) Tj ET q 353.64 457.82 m 353.64 444.62 l 357.84 444.62 l 357.84 453.2 l 442.98 453.2 l 442.98 444.62 l 446.46 444.62 l 446.46 457.82 l W* n 0 841.98 595.2 -841.98 re W n 0.898 g 353.64 444.62 92.82 13.2 re f Q 0.898 g q 1 0 0 1 357.84 453.2 cm 0 0 m 85.14 0 l 85.14 -8.58 l 0 -8.58 l f Q BT 7.5 0 0 7.5 357.84 446.24 Tm 0 g ( ) Tj 7.98 0 0 7.98 448.62 446.42 Tm -0.0022 Tc 1.3484 Tw [ (- ) -1045.1 ( ) ] TJ ET 0.898 g 354 457.82 0.72 0.059998 re f 0 g 354 457.88 0.72 0.72 re f 354 457.88 92.16 0.72 re f 0.898 g 354.72 457.82 91.44 0.059998 re f 0 g 446.16 457.88 0.72003 0.72 re f 446.16 457.88 0.72003 0.72 re f BT 7.5 0 0 7.5 39 431.78 Tm 0.0032 Tc -0.001 Tw [ ( ) -2600 (3\) ) -648 (A) 6.2 (u) -0.6 (tres ex) 15.2 (onrations ) ] TJ 6 0 0 6 147.6 431.78 Tm -0.003 Tc 0.0052 Tw [ (\(a) -6.8 (rt) -5.2 (.) -5.2 ( 4) -6.8 (3) -6.8 (\)) 0 ( ) ] TJ 7.5 0 0 7.5 170.34 431.78 Tm 0 Tc 0 Tw ( ) Tj 6 0 0 6 340.26 431.48 Tm 0.0038 Tc (13) Tj 7.5 0 0 7.5 346.98 431.48 Tm 0 Tc ( ) Tj 1.448 0.04 TD ( ) Tj 7.98 0 0 7.98 448.62 431.96 Tm -0.0022 Tc 1.3484 Tw [ (- ) -1045.1 ( ) ] TJ ET 0.602 g q 1 0 0 1 354 444.62 cm 0 0 m 92.16 0 l 92.16 -0.48 l 0 -0.48 l f Q BT 7.5 0 0 7.5 39 417.32 Tm 0 g 0.0032 Tc -0.001 Tw [ ( ) -2600 (4\) ) -648 (A) 6.2 (u) -0.6 (tres ex) 15.2 (onrations ) ] TJ 6 0 0 6 147.6 417.32 Tm [ (\() 6.2 (a) -0.6 (r) 6.2 (t. 44 et 56q) 9.4 (uater) 6.2 (\)) 6.2 ( ) ] TJ 7.5 0 0 7.5 202.5 417.32 Tm 0 Tc 0 Tw ( ) Tj 6 0 0 6 340.26 417.02 Tm 0.0038 Tc (14) Tj 7.5 0 0 7.5 346.98 417.02 Tm 0 Tc ( ) Tj 1.448 0.04 TD ( ) Tj 7.98 0 0 7.98 448.62 417.5 Tm -0.0022 Tc 1.3484 Tw [ (- ) -1045.1 ( ) ] TJ ET 0.602 g q 1 0 0 1 354 430.16 cm 0 0 m 92.16 0 l 92.16 -0.48 l 0 -0.48 l f Q BT 7.5 0 0 7.5 39 402.86 Tm 0 g 0.0035 Tc 2.5987 Tw [ ( 5\) ) 1952 (T) 6.3 (abacs ) 2600 (fabriqus ) ] TJ 6 0 0 6 340.26 402.56 Tm 0.0038 Tc 0 Tw (15) Tj 7.5 0 0 7.5 346.98 402.56 Tm 0 Tc ( ) Tj 1.448 0.04 TD ( ) Tj 7.98 0 0 7.98 448.62 403.04 Tm -0.0022 Tc 1.3484 Tw [ (- ) -1045.1 ( ) ] TJ ET 0.602 g q 1 0 0 1 354 415.7 cm 0 0 m 92.16 0 l 92.16 -0.48 l 0 -0.48 l f Q BT 7.5 0 0 7.5 39 387.8 Tm 0 g 0.0031 Tc -0.0009 Tw [ ( ) -2600 (6\) ) -648 (O) 4.9 (prations ralises l'tranger: ) -20832 ( ) -1616 ( ) ] TJ 7.98 0 0 7.98 450 387.98 Tm 1.5041 Tc 0 Tw [ ( ) -887.2 ( ) ] TJ ET 0.602 g q 1 0 0 1 354 401.24 cm 0 0 m 92.16 0 l 92.16 -0.48 l 0 -0.48 l f Q BT 7.5 0 0 7.5 39 371.24 Tm 0 g 3.4982 Tc ( ) Tj 42.512 0 TD 0 Tc ( ) Tj 7.98 0 0 7.98 450 371.42 Tm 1.5041 Tc [ ( ) -887.2 ( ) ] TJ 7.5 0 0 7.5 39 356.12 Tm 3.4982 Tc ( ) Tj 4.32 2.424 TD 0.0032 Tc -0.001 Tw [ (a\) Liv) 15.2 (r) 0.2 (aisons subsquentes des acquisitions intracommunautaires dans le ) ] TJ 1.52 -1.2 TD -0.0009 Tw [ (cadre d'oprations triangulaires, lorsque le destinataire identifi la T) 5.9 (V) 6.1 (A) 6.1 ( ) ] TJ T* [ (dans l') 6.1 (t) 0.9 (at membre de destination des biens y) 15.1 ( est le redev) 15.1 (able de la tax) 15.1 (e) ] TJ 32.544 0.136 TD 0 Tc 0 Tw ( ) Tj 6 0 0 6 340.26 356.3 Tm 0.0038 Tc (16) Tj 7.5 0 0 7.5 346.98 357.32 Tm 0 Tc ( ) Tj ET q 354.72 368.78 m 354.72 354.5 l 357.84 354.5 l 357.84 363.08 l 442.98 363.08 l 442.98 354.5 l 446.16 354.5 l 446.16 368.78 l W* n 0 841.98 595.2 -841.98 re W n 0.898 g 354.72 354.5 91.44 14.28 re f Q 0.898 g q 1 0 0 1 357.84 363.08 cm 0 0 m 85.14 0 l 85.14 -8.58 l 0 -8.58 l f Q BT 7.5 0 0 7.5 357.84 356.12 Tm 0 g ( ) Tj 7.98 0 0 7.98 448.62 356.3 Tm -0.0022 Tc 1.3484 Tw [ (- ) -1045.1 ( ) ] TJ ET 354 368.78 0.72 0.78 re f 354 368.84 92.16 0.72 re f 0.898 g 354.72 368.78 91.44 0.059998 re f 0 g 446.16 368.78 0.72003 0.78 re f 446.16 368.84 0.72003 0.72 re f 354 354.5 0.72 14.28 re f 446.16 354.5 0.72003 14.28 re f 354 354.02 0.72 0.47998 re f 0.602 g 354.72 354.02 91.44 0.47998 re f 0 g 446.16 354.02 0.72003 0.47998 re f 354 352.46 0.72 1.56 re f 446.16 352.46 0.72003 1.56 re f BT 7.5 0 0 7.5 39 339.32 Tm 0.0031 Tc -0.0009 Tw [ ( ) -3496 ( ) -264 (b\) A) 6.1 (u) -0.7 (tres oprations ralises l'tranger ) ] TJ 6 0 0 6 340.26 339.02 Tm 0.0038 Tc 0 Tw (17) Tj 7.5 0 0 7.5 346.98 339.02 Tm 0 Tc ( ) Tj 1.448 0.04 TD ( ) Tj 7.98 0 0 7.98 448.62 339.5 Tm -0.0022 Tc 1.3484 Tw [ (- ) -1045.1 ( ) ] TJ ET 354 351.74 0.72 0.72 re f 354 351.74 92.88 0.72 re f 446.16 351.74 0.72003 0.72 re f BT 7.5 0 0 7.5 39 324.86 Tm 0.0034 Tc 2.5988 Tw [ ( 7\) ) ] TJ 6 0 0 6 72.9 324.56 Tm 0.0038 Tc 0 Tw (18) Tj 7.5 0 0 7.5 79.62 324.56 Tm 0 Tc ( ) Tj 1.008 0.04 TD ( ) Tj 6 0 0 6 340.26 324.56 Tm 0.0038 Tc (19) Tj 7.5 0 0 7.5 346.98 324.56 Tm 0 Tc ( ) Tj 1.448 0.04 TD ( ) Tj 7.98 0 0 7.98 448.62 325.04 Tm -0.0022 Tc 2.2432 Tw [ (- ) 744.4 ( ) ] TJ ET 0.602 g q 1 0 0 1 354 337.7 cm 0 0 m 92.16 0 l 92.16 -0.48 l 0 -0.48 l f Q 84.66 322.76 247.98 0.48001 re f q 1 0 0 1 354 323.24 cm 0 0 m 92.16 0 l 92.16 -0.48 l 0 -0.48 l f Q BT /TT4 1 Tf 7.5 0 0 7.5 32.7 307.1 Tm 0 g 0.002 Tc 0.0002 Tw [ (3. ) -656 (Chiffre d'affaires imposable \(hors T) 20.8 (V) 5 (A) 44.2 (\)) -1 ( ) ] TJ /TT6 1 Tf 30.368 0 TD 0 Tc 0 Tw ( ) Tj /TT4 1 Tf 0.28 0 TD ( ) Tj /TT6 1 Tf 6 0 0 6 340.26 306.74 Tm 0.0038 Tc (22 ) Tj /TT4 1 Tf 7.5 0 0 7.5 357.84 307.1 Tm 0 Tc ( ) Tj /TT6 1 Tf 7.98 0 0 7.98 450 307.22 Tm 1.5041 Tc [ ( ) -887.2 ( ) ] TJ ET q 1 0 0 1 354 321.2 cm 0 0 m 92.16 0 l 92.16 -0.72 l 0 -0.72 l f Q 0.602 g q 1 0 0 1 354 305.42 cm 0 0 m 92.16 0 l 92.16 -0.48 l 0 -0.48 l f Q BT /TT4 1 Tf 7.5 0 0 7.5 39 290.3 Tm 0 g 0 Tc ( ) Tj /TT6 1 Tf 27.424 -0.008 TD 0.0032 Tc -0.001 Tw [ (au taux) 15.2 ( de) -3184.6 (15% ) ] TJ 6 0 0 6 340.26 289.94 Tm 0.0038 Tc 0 Tw (32 ) Tj /TT4 1 Tf 7.5 0 0 7.5 357.84 290.3 Tm 0 Tc ( ) Tj /TT6 1 Tf 12.288 -0.008 TD ( ) Tj 6 0 0 6 468 289.94 Tm 0.0038 Tc (37 ) Tj 7.5 0 0 7.5 485.52 290.24 Tm 11.0582 Tc ( ) Tj ET q 1 0 0 1 354 303.38 cm 0 0 m 92.16 0 l 92.16 -0.72 l 0 -0.72 l f Q BT /TT4 1 Tf 7.5 0 0 7.5 39 275.84 Tm 0 Tc ( ) Tj /TT6 1 Tf 3.768 -0.008 TD 0.0016 Tc 31.5286 Tw [ ( ) 31528 (6% ) ] TJ 6 0 0 6 340.26 275.48 Tm 0.0038 Tc 0 Tw (33 ) Tj /TT4 1 Tf 7.5 0 0 7.5 357.84 275.84 Tm 0 Tc ( ) Tj /TT6 1 Tf 12.288 -0.008 TD (+ ) Tj 6 0 0 6 468 275.48 Tm 0.0038 Tc (38 ) Tj 7.5 0 0 7.5 485.52 275.78 Tm 10.8742 Tc ( +) Tj ET 0.602 g q 1 0 0 1 354 288.62 cm 0 0 m 92.16 0 l 92.16 -0.48 l 0 -0.48 l f Q 481.62 288.14 85.08 0.48001 re f BT /TT4 1 Tf 7.5 0 0 7.5 39 261.38 Tm 0 g 0 Tc ( ) Tj /TT6 1 Tf 3.768 -0.008 TD 0.0013 Tc 31.8089 Tw [ ( 3% ) ] TJ 6 0 0 6 340.26 261.02 Tm 0.0038 Tc 0 Tw (34 ) Tj /TT4 1 Tf 7.5 0 0 7.5 357.84 261.38 Tm 0 Tc ( ) Tj /TT6 1 Tf 12.288 -0.008 TD (+ ) Tj 6 0 0 6 468 261.02 Tm 0.0038 Tc (39 ) Tj 7.5 0 0 7.5 485.52 261.32 Tm 10.8742 Tc ( +) Tj ET 0.602 g q 1 0 0 1 354 274.16 cm 0 0 m 92.16 0 l 92.16 -0.48 l 0 -0.48 l f Q 481.62 273.68 85.08 0.47998 re f BT /TT4 1 Tf 7.5 0 0 7.5 39 246.92 Tm 0 g 0 Tc ( ) Tj /TT6 1 Tf 3.768 -0.008 TD 0.0021 Tc 31.2481 Tw [ ( 12% ) ] TJ 6 0 0 6 340.26 246.56 Tm 0.0038 Tc 0 Tw (35 ) Tj /TT4 1 Tf 7.5 0 0 7.5 357.84 246.92 Tm 0 Tc ( ) Tj /TT6 1 Tf 12.288 -0.008 TD (+ ) Tj 6 0 0 6 468 246.56 Tm 0.0038 Tc (40 ) Tj 7.5 0 0 7.5 485.52 246.86 Tm 10.8742 Tc ( +) Tj ET 0.602 g q 1 0 0 1 354 259.7 cm 0 0 m 92.16 0 l 92.16 -0.48 l 0 -0.48 l f Q 481.62 259.22 85.08 0.48001 re f BT /TT4 1 Tf 7.5 0 0 7.5 39 232.46 Tm 0 g 0 Tc ( ) Tj /TT6 1 Tf 3.768 -0.008 TD ( ) Tj 6 0 0 6 288.6 232.4 Tm 0.0038 Tc (84) Tj 7.5 0 0 7.5 295.32 232.4 Tm 0.602 g (____) Tj 0 g 2.24 0 TD -0.0012 Tc (% ) Tj 6 0 0 6 340.26 232.1 Tm 0.0038 Tc (82 ) Tj /TT4 1 Tf 7.5 0 0 7.5 357.84 232.46 Tm 0 Tc ( ) Tj /TT6 1 Tf 12.288 -0.008 TD (+ ) Tj 6 0 0 6 468 232.1 Tm 0.0038 Tc (83 ) Tj 7.5 0 0 7.5 485.52 232.4 Tm 10.8742 Tc ( +) Tj ET 0.602 g q 1 0 0 1 354 245.24 cm 0 0 m 92.16 0 l 92.16 -0.48 l 0 -0.48 l f Q 481.62 244.76 85.08 0.48 re f q 1 0 0 1 354 230.78 cm 0 0 m 92.16 0 l 92.16 -0.48 l 0 -0.48 l f Q 481.62 230.3 85.08 0.48001 re f BT /TT4 1 Tf 7.5 0 0 7.5 39 215.66 Tm 0 g 0.0031 Tc -0.0009 Tw [ ( ) -23312 (S) 6.1 (o) 5.9 (u) 5.9 (s) -0.7 (-to) 5.9 (tal d) 5.9 (e) -0.7 ( la taxe d) 5.9 (u) 5.9 ( p) 5.9 (o) 5.9 (i) 0.9 (n) 5.9 (t) 0.1 ( 3:) ] TJ /TT6 1 Tf 6 0 0 6 336.48 215.3 Tm 0 Tc 0 Tw ( ) Tj /TT4 1 Tf 7.5 0 0 7.5 357.84 215.66 Tm ( ) Tj /TT6 1 Tf 12.288 -0.008 TD ( ) Tj 6 0 0 6 468 215.3 Tm 0.0038 Tc (41 ) Tj 7.5 0 0 7.5 485.52 215.6 Tm 11.0582 Tc ( ) Tj ET 481.62 228.02 85.08 0.72 re f BT /TT4 1 Tf 7.5 0 0 7.5 32.7 195.62 Tm 0.0017 Tc 0.0005 Tw [ (4. ) -656 (A) 43.9 (c) -2.1 (quisitions intracommunautaires de biens ) ] TJ /TT6 1 Tf 32.92 0 TD 0.0035 Tc -0.0013 Tw [ (au taux) 15.5 ( de) ] TJ /TT4 1 Tf 4.688 0 TD 0 Tc 0 Tw ( ) Tj /TT6 1 Tf 2.896 -0.008 TD ( ) Tj /TT4 1 Tf 2.848 0.008 TD ( ) Tj /TT6 1 Tf 12.288 -0.008 TD ( ) Tj 6 0 0 6 471.36 195.26 Tm ( ) Tj 7.5 0 0 7.5 485.52 206.54 Tm ( ) Tj 11.152 -1.464 TD ( ) Tj ET 0.602 g 481.62 213.5 85.08 0.48001 re f BT /TT4 1 Tf 7.5 0 0 7.5 39 181.64 Tm 0 g ( ) Tj /TT6 1 Tf 35.312 -0.008 TD 0.0021 Tc (15% ) Tj 6 0 0 6 340.26 181.28 Tm 0.0038 Tc (42 ) Tj /TT4 1 Tf 7.5 0 0 7.5 357.84 181.64 Tm 0 Tc ( ) Tj /TT6 1 Tf 12.288 -0.008 TD ( ) Tj 6 0 0 6 468 181.28 Tm 0.0038 Tc (47 ) Tj 7.5 0 0 7.5 485.52 181.58 Tm 10.8742 Tc ( ) Tj /TT4 1 Tf -59.536 -1.92 TD 0 Tc ( ) Tj /TT6 1 Tf 35.592 -0.008 TD 0.0016 Tc 0.0006 Tw ( 6% ) Tj 6 0 0 6 340.26 166.82 Tm 0.0038 Tc 0 Tw (43 ) Tj /TT4 1 Tf 7.5 0 0 7.5 357.84 167.18 Tm 0 Tc ( ) Tj /TT6 1 Tf 12.104 -0.008 TD (+ ) Tj 6 0 0 6 468 166.82 Tm 0.0038 Tc (48 ) Tj 7.5 0 0 7.5 485.52 167.12 Tm 10.8742 Tc ( +) Tj ET 0.602 g q 1 0 0 1 354 179.96 cm 0 0 m 92.16 0 l 92.16 -0.48 l 0 -0.48 l f Q 481.62 179.48 85.08 0.48 re f BT /TT4 1 Tf 7.5 0 0 7.5 39 152.72 Tm 0 g 0 Tc ( ) Tj /TT6 1 Tf 35.872 -0.008 TD 0.0013 Tc (3% ) Tj 6 0 0 6 340.26 152.36 Tm 0.0038 Tc (44 ) Tj /TT4 1 Tf 7.5 0 0 7.5 357.84 152.72 Tm 0 Tc ( ) Tj /TT6 1 Tf 12.104 -0.008 TD (+ ) Tj 6 0 0 6 468 152.36 Tm 0.0038 Tc (49 ) Tj 7.5 0 0 7.5 485.52 152.66 Tm 10.8742 Tc ( +) Tj ET 0.602 g q 1 0 0 1 354 165.5 cm 0 0 m 92.16 0 l 92.16 -0.48 l 0 -0.48 l f Q 481.62 165.02 85.08 0.48 re f BT /TT4 1 Tf 7.5 0 0 7.5 39 138.26 Tm 0 g 0 Tc ( ) Tj /TT6 1 Tf 35.312 -0.008 TD 0.0021 Tc (12% ) Tj 6 0 0 6 340.26 137.9 Tm 0.0038 Tc (45 ) Tj /TT4 1 Tf 7.5 0 0 7.5 357.84 138.26 Tm 0 Tc ( ) Tj /TT6 1 Tf 12.104 -0.008 TD (+ ) Tj 6 0 0 6 468 137.9 Tm 0.0038 Tc (50 ) Tj 7.5 0 0 7.5 485.52 138.2 Tm 10.8742 Tc ( +) Tj ET 0.602 g q 1 0 0 1 354 151.04 cm 0 0 m 92.16 0 l 92.16 -0.48 l 0 -0.48 l f Q 481.62 150.56 85.08 0.48001 re f q 1 0 0 1 354 136.58 cm 0 0 m 92.16 0 l 92.16 -0.48 l 0 -0.48 l f Q 481.62 136.1 85.08 0.48001 re f BT /TT4 1 Tf 7.5 0 0 7.5 39 123.44 Tm 0 g 0 Tc ( ) Tj /TT6 1 Tf 2.832 7.808 TD 0.0031 Tc -0.0009 Tw [ (1\) ) -336 (A) 6.1 (c) -0.9 (quisitions intracommunautaires de biens ) ] TJ 6 0 0 6 217.14 182 Tm 0.003 Tc -0.0008 Tw [ (\() 6 (a) -0.8 (r) 6 (t. 18/1\)) ] TJ 7.5 0 0 7.5 243.24 182 Tm 0 Tc 0 Tw ( ) Tj -24.4 -1.144 TD ( ) Tj T* 0.0033 Tc -0.0011 Tw [ (2\) ) -336 (Liv) 15.3 (r) 0.3 (aisons de biens l'intrieur du pay) 15.3 (s dans le cadre ) ] TJ 1.512 -1.144 TD 0.0032 Tc (des oprations triangulaires et pour lesquelles ) Tj T* 0.0029 Tc -0.0007 Tw [ (l'assujetti est le dbiteur de la tax) 14.9 (e) -0.9 ( ) ] TJ 6 0 0 6 188.82 147.68 Tm 0.0026 Tc -0.0004 Tw [ (\() 5.6 (a) -1.2 (r) 5.6 (t. 26/1/a, al. 2\)) ] TJ 7.5 0 0 7.5 234.72 147.68 Tm 0 Tc 0 Tw ( ) Tj 5.568 -3.24 TD 0.0031 Tc -0.0009 Tw [ ( ex) 15.1 (onres ) ] TJ 6 0 0 6 340.26 123.08 Tm 0.0038 Tc 0 Tw (85 ) Tj /TT4 1 Tf 7.5 0 0 7.5 357.84 123.44 Tm 0 Tc ( ) Tj /TT6 1 Tf 12.104 -0.008 TD (+ ) Tj 6 0 0 6 471.36 123.08 Tm ( ) Tj 7.5 0 0 7.5 485.52 123.38 Tm ( ) Tj ET 481.62 133.82 85.08 0.72 re f 0.602 g q 1 0 0 1 354 121.76 cm 0 0 m 92.16 0 l 92.16 -0.48 l 0 -0.48 l f Q BT /TT4 1 Tf 7.5 0 0 7.5 39 106.64 Tm 0 g 0.0029 Tc -0.0007 Tw [ ( ) -10552 (T) 21.7 (o) 5.7 (tal b) 5.7 (ase d) 5.7 ('imp) 5.7 (o) 5.7 (s) -0.9 (itio) 5.7 (n) 5.7 ( et so) 5.7 (u) 5.7 (s) -0.9 (-to) 5.7 (tal d) 5.7 (e) -0.9 ( la taxe d) 5.7 (u) 5.7 ( p) 5.7 (o) 5.7 (i) 0.7 (n) 5.7 (t) -0.1 ( 4 :) ] TJ /TT6 1 Tf 6 0 0 6 340.26 106.28 Tm 0.0038 Tc 0 Tw (46 ) Tj ET q 353.64 118.94 m 353.64 104.96 l 357.84 104.96 l 357.84 113.84 l 442.98 113.84 l 442.98 104.96 l 446.46 104.96 l 446.46 118.94 l W* n 0 841.98 595.2 -841.98 re W n 0.898 g 353.64 104.96 92.82 13.98 re f Q 0.898 g q 1 0 0 1 357.84 113.84 cm 0 0 m 85.14 0 l 85.14 -8.88 l 0 -8.88 l f Q BT /TT4 1 Tf 7.5 0 0 7.5 357.84 106.64 Tm 0 g 0 Tc ( ) Tj /TT6 1 Tf 12.288 -0.008 TD ( ) Tj 6 0 0 6 468 106.28 Tm 0.0038 Tc (51 ) Tj 7.5 0 0 7.5 485.52 106.58 Tm 11.0582 Tc ( ) Tj ET q 1 0 0 1 354 119.72 cm 0 0 m 92.16 0 l 92.16 -0.72 l 0 -0.72 l f Q 0.898 g q 1 0 0 1 354 119 cm 0 0 m 92.16 0 l 92.16 -0.06 l 0 -0.06 l f Q BT 6 0 0 6 343.62 98.9003 Tm 0 g 0 Tc ( ) Tj /TT4 1 Tf 7.5 0 0 7.5 357.84 97.2803 Tm ( ) Tj /TT6 1 Tf 12.288 0.032 TD ( ) Tj 6 0 0 6 471.36 98.9003 Tm ( ) Tj 7.5 0 0 7.5 485.52 97.5203 Tm ( ) Tj ET 0.602 g q 1 0 0 1 354 104.96 cm 0 0 m 92.16 0 l 92.16 -0.48 l 0 -0.48 l f Q 481.62 104.48 85.08 0.47998 re f BT /TT4 1 Tf 7.5 0 0 7.5 32.7 93.2603 Tm 0 g 0.0018 Tc 0.0004 Tw [ (5. ) -656 (A) 44 (c) -2 (quisitions effectues dans le) ] TJ 16.736 0 TD 0.0015 Tc 0.0007 Tw ( cadre d'oprations triangulaires ) Tj /TT6 1 Tf 15.792 0 TD 0.0035 Tc 0 Tw (lorsque ) Tj -30.752 -1.152 TD 0.0033 Tc -0.0011 Tw [ (l'acquisition a t effectue pour les besoins d'une liv) 15.3 (raison subsquente un ) ] TJ 0 -1.144 TD 0.003 Tc -0.0008 Tw [ (acqureur identifi la T) 5.8 (V) 6 (A) 6 ( dans l') 6 (t) 0.8 (at membre de destination des biens et qui y) 15 ( est ) ] TJ T* 0.0032 Tc -0.001 Tw [ (le redev) 15.2 (able de la tax) 15.2 (e) -0.6 ( ) ] TJ 6 0 0 6 123.9 67.4603 Tm 0.0027 Tc -0.0005 Tw [ (\() 5.7 (a) -1.1 (r) 5.7 (t. 18ter) 5.7 (/2, al. 2\)) ] TJ /TT13 1 Tf 7.5 0 0 7.5 171.78 67.4603 Tm 0 Tc 0 Tw ( ) Tj /TT6 1 Tf 6 0 0 6 340.26 65.7203 Tm 0.0038 Tc (52 ) Tj ET q 354.72 78.62 m 354.72 64.4 l 357.84 64.4 l 357.84 73.28 l 442.98 73.28 l 442.98 64.4 l 446.16 64.4 l 446.16 78.62 l W* n 0 841.98 595.2 -841.98 re W n 0.898 g 354.72 64.4 91.44 14.22 re f Q 0.898 g q 1 0 0 1 357.84 73.28 cm 0 0 m 85.14 0 l 85.14 -8.88 l 0 -8.88 l f Q BT /TT4 1 Tf 7.5 0 0 7.5 357.84 66.0803 Tm 0 g 0 Tc ( ) Tj /TT6 1 Tf 12.288 -0.008 TD ( ) Tj 6 0 0 6 471.36 65.7203 Tm ( ) Tj 7.5 0 0 7.5 485.52 66.0203 Tm ( ) Tj ET 354 78.62 0.72 0.78 re f 354 78.68 92.16 0.72 re f 0.898 g 354.72 78.62 91.44 0.059998 re f 0 g 446.16 78.62 0.72003 0.78 re f 446.16 78.68 0.72003 0.72 re f 354 64.4 0.72 14.22 re f 446.16 64.4 0.72003 14.22 re f 354 63.92 0.72 0.47998 re f 0.602 g 354.72 63.92 91.44 0.47998 re f 0 g 446.16 63.92 0.72003 0.47998 re f 354 62.36 0.72 1.56 re f 446.16 62.36 0.72003 1.56 re f BT /TT4 1 Tf 7.5 0 0 7.5 39 41.7203 Tm 0.0031 Tc -0.0009 Tw [ ( ) -21952 (T) 21.9 (o) 5.9 (tal d) 5.9 (e) -0.7 ( taxe \(=) ] TJ 6 0 0 6 260.64 41.7203 Tm 0.0038 Tc 0 Tw (41) Tj 7.5 0 0 7.5 267.36 41.7203 Tm 0.0007 Tc 0.0015 Tw ( + ) Tj 6 0 0 6 275.94 41.7203 Tm 0.0038 Tc 0 Tw (51) Tj 7.5 0 0 7.5 282.66 41.7203 Tm 0.0032 Tc -0.001 Tw [ (\) - rep) 6 (o) 6 (r) 0.4 (ter:) ] TJ /TT6 1 Tf 6 0 0 6 336.48 41.3604 Tm 0 Tc 0 Tw ( ) Tj /TT4 1 Tf 7.5 0 0 7.5 357.84 41.7203 Tm ( ) Tj /TT6 1 Tf 12.288 -0.008 TD ( ) Tj 6 0 0 6 468 41.3604 Tm 0.0038 Tc (86 ) Tj 7.5 0 0 7.5 485.52 41.6603 Tm 11.0582 Tc ( ) Tj ET 354 61.64 0.72 0.72 re f 354 61.64 92.88 0.72 re f 446.16 61.64 0.72003 0.72 re f 0.602 g 481.26 39.56 85.8 0.48001 re f Q q Q
+endstream
+endobj
+209 0 obj
+<<
+/Length 0
+>>
+stream
+
+endstream
+endobj
+225 0 obj
+<<
+/Length 0
+>>
+stream
+
+endstream
+endobj
+226 0 obj
+<<
+/Length 0
+>>
+stream
+
+endstream
+endobj
+227 0 obj
+<<
+/Length 0
+>>
+stream
+
+endstream
+endobj
+228 0 obj
+<<
+/Length 0
+>>
+stream
+
+endstream
+endobj
+229 0 obj
+<<
+/Length 0
+>>
+stream
+
+endstream
+endobj
+230 0 obj
+<<
+/Length 0
+>>
+stream
+
+endstream
+endobj
+231 0 obj
+<<
+/Length 0
+>>
+stream
+
+endstream
+endobj
+232 0 obj
+<<
+/Length 0
+>>
+stream
+
+endstream
+endobj
+xref
+208 2
+0000095377 00000 n
+0000122031 00000 n
+225 8
+0000122083 00000 n
+0000122135 00000 n
+0000122187 00000 n
+0000122239 00000 n
+0000122291 00000 n
+0000122343 00000 n
+0000122395 00000 n
+0000122447 00000 n
+trailer
+<<
+/Root 224 0 R
+/Size 250
+/Info 250 0 R
+/Prev 90282
+>>
+startxref
+122499
+%%EOF
diff --git a/addons/l10n_lu/wizard/__init__.py b/addons/l10n_lu/wizard/__init__.py
new file mode 100644
index 00000000000..0ff0d08776c
--- /dev/null
+++ b/addons/l10n_lu/wizard/__init__.py
@@ -0,0 +1 @@
+import print_vat
diff --git a/addons/l10n_lu/wizard/pdf_ext.py b/addons/l10n_lu/wizard/pdf_ext.py
new file mode 100644
index 00000000000..200fa813218
--- /dev/null
+++ b/addons/l10n_lu/wizard/pdf_ext.py
@@ -0,0 +1,103 @@
+# -*- encoding: utf-8 -*-
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+""" Copyright (c) 2003-2007 LOGILAB S.A. (Paris, FRANCE).
+ http://www.logilab.fr/ -- mailto:contact@logilab.fr
+
+manipulate pdf and fdf files. pdftk recommended.
+
+Notes regarding pdftk, pdf forms and fdf files (form definition file)
+fields names can be extracted with:
+ pdftk orig.pdf generate_fdf output truc.fdf
+to merge fdf and pdf:
+ pdftk orig.pdf fill_form test.fdf output result.pdf [flatten]
+without flatten, one could further edit the resulting form.
+with flatten, everything is turned into text.
+"""
+
+import os
+import tools
+
+HEAD="""%FDF-1.2
+%\xE2\xE3\xCF\xD3
+1 0 obj
+<<
+/FDF
+<<
+/Fields [
+"""
+
+TAIL="""]
+>>
+>>
+endobj
+trailer
+
+<<
+/Root 1 0 R
+>>
+%%EOF
+"""
+
+def output_field( f ):
+ return "\xfe\xff" + "".join( [ "\x00"+c for c in f ] )
+
+def extract_keys(lines):
+ keys = []
+ for line in lines:
+ if line.startswith('/V'):
+ pass #print 'value',line
+ elif line.startswith('/T'):
+ key = line[7:-2]
+ key = ''.join(key.split('\x00'))
+ keys.append( key )
+ return keys
+
+def write_field(out, key, value):
+ out.write("<<\n")
+ if value:
+ out.write("/V (%s)\n" %value)
+ else:
+ out.write("/V /\n")
+ out.write("/T (%s)\n" % output_field(key) )
+ out.write(">> \n")
+
+def write_fields(out, fields):
+ out.write(HEAD)
+ for key in fields:
+ value = fields[key]
+ write_field(out, key, value)
+# write_field(out, key+"a", value) # pour copie-carbone sur autres pages
+ out.write(TAIL)
+
+def extract_keys_from_pdf(filename):
+ # what about using 'pdftk filename dump_data_fields' and parsing the output ?
+ os.system('pdftk %s generate_fdf output /tmp/toto.fdf' % filename)
+ lines = file('/tmp/toto.fdf').readlines()
+ return extract_keys(lines)
+
+
+def fill_pdf(infile, outfile, fields):
+ write_fields(file('/tmp/toto.fdf', 'w'), fields)
+ os.system('pdftk %s fill_form /tmp/toto.fdf output %s flatten' % (infile, outfile))
+
+def testfill_pdf(infile, outfile):
+ keys = extract_keys_from_pdf(infile)
+ fields = []
+ for key in keys:
+ fields.append( (key, key, '') )
+ fill_pdf(infile, outfile, fields)
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/l10n_lu/wizard/print_vat.py b/addons/l10n_lu/wizard/print_vat.py
new file mode 100644
index 00000000000..fbd9c29bb41
--- /dev/null
+++ b/addons/l10n_lu/wizard/print_vat.py
@@ -0,0 +1,93 @@
+# -*- encoding: utf-8 -*-
+#Copyright (c) Vincent Cardon
+# Denis Cardon and Emmanuel RICHARD.
+#Ingenieur fondateur
+#Tranquil IT Systems
+
+
+import wizard
+import time
+import datetime
+import pooler
+import sys
+from mx.DateTime import *
+import tools
+from report.render import render
+from report.interface import report_int
+import os
+import pdf_ext
+
+_tax_form = """
+"""
+
+_tax_fields = {
+ 'tax_code_id': {
+ 'string': 'Company',
+ 'type': 'many2one',
+ 'relation': 'account.tax.code',
+ 'required': True,
+ 'domain': [('parent_id','=',False)]},
+ 'period_id': {
+ 'string':'Period',
+ 'type': 'many2one',
+ 'relation': 'account.period',
+ 'required':True
+ }
+}
+
+class external_pdf(render):
+ def __init__(self, pdf):
+ render.__init__(self)
+ self.pdf = pdf
+ self.output_type='pdf'
+ def _render(self):
+ return self.pdf
+
+
+class report_custom(report_int):
+ def create(self, cr, uid, ids, datas, context={}):
+ print datas, ids, uid
+
+ pool = pooler.get_pool(cr.dbname)
+
+ taxobj = pool.get('account.tax.code')
+ code_ids = taxobj.search(cr, uid, [('parent_id','child_of',[datas['form']['tax_code_id']])])
+ result = {}
+ for t in taxobj.browse(cr, uid, code_ids, {'period_id': datas['form']['period_id']}):
+ if t.code:
+ result['case_'+str(t.code)] = '%.2f' % (t.sum_period or 0.0, )
+
+ user = pool.get('res.users').browse(cr, uid, uid, context)
+
+ # Not Clean, to be changed
+ partner = user.company_id.partner_id
+ result['info_name'] = user.company_id.name
+ result['info_vatnum'] = partner.vat
+ if partner.address:
+ result['info_address'] = partner.address[0].street
+ result['info_address2'] = str(partner.address[0].zip) + ' ' + str(partner.address[0].city)
+
+ pdf_ext.fill_pdf('addons/l10n_lu/wizard/2008_DECL_F_M10.pdf', '/tmp/output.pdf', result)
+ self.obj = external_pdf(file('/tmp/output.pdf').read())
+ self.obj.render()
+ return (self.obj.pdf, 'pdf')
+
+report_custom('report.l10n_lu.tax.report.print')
+
+
+class wizard_report(wizard.interface):
+ states = {
+ 'init': {
+ 'actions': [],
+ 'result': {'type':'form', 'arch':_tax_form, 'fields':_tax_fields, 'state':[('end','Cancel'),('pdf','Print VAT Declaration')]},
+ },
+ 'pdf': {
+ 'actions': [],
+ 'result': {'type':'print', 'report': 'l10n_lu.tax.report.print', 'state':'end'},
+ },
+ }
+wizard_report('l10n_lu.tax.report.wizard')
+
diff --git a/addons/lunch/__init__.py b/addons/lunch/__init__.py
new file mode 100644
index 00000000000..949e893c0f0
--- /dev/null
+++ b/addons/lunch/__init__.py
@@ -0,0 +1,6 @@
+# -*- encoding: utf-8 -*-
+import lunch
+import wizard
+import report
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/__terp__.py b/addons/lunch/__terp__.py
new file mode 100644
index 00000000000..46da1f5e13f
--- /dev/null
+++ b/addons/lunch/__terp__.py
@@ -0,0 +1,15 @@
+# -*- encoding: utf-8 -*-
+{
+ "name": "Lunch Module",
+ "author": "Tiny",
+ "version": "0.1",
+ "depends": ["base", "process", "hr"],
+ "init_xml": [],
+ "update_xml": ['lunch_wizard.xml', 'lunch_view.xml', 'lunch_report.xml',
+ 'process/lunch_process.xml'
+ ],
+ "demo_xml": ['lunch_demo.xml'],
+ "installable": True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
new file mode 100644
index 00000000000..167a075d95b
--- /dev/null
+++ b/addons/lunch/lunch.py
@@ -0,0 +1,171 @@
+# -*- encoding: utf-8 -*-
+from osv import osv, fields
+import time
+
+class lunch_category(osv.osv):
+ _name = 'lunch.category'
+ _description = "Category"
+
+ _columns = {
+ 'name': fields.char('Name', required=True, size=50),
+ }
+
+ _order = 'name'
+
+lunch_category()
+
+class lunch_product(osv.osv):
+ _name = 'lunch.product'
+
+ def _category_name_get(self, cr, uid, context={}):
+ obj = self.pool.get('lunch.category')
+ cat_ids= obj.search(cr,uid,[])
+ res = obj.read(cr,uid,cat_ids,['name', 'category'])
+ return [(str(r['id']), r['name']) for r in res]+ [('0','')]
+
+ _columns = {
+ 'name': fields.char('Name', size=50, required=True),
+ 'category_id': fields.selection(_category_name_get, 'Category', size=32),
+ 'description': fields.char('Description', size=128, required=False),
+ 'price': fields.float('Price', digits=(16,2)),
+ 'active': fields.boolean('Active'),
+ }
+
+ _defaults = {
+ 'active': lambda *a : True,
+ }
+
+lunch_product()
+
+class lunch_cashbox(osv.osv):
+ _name='lunch.cashbox'
+
+ def amount_available(self, cr, uid, ids, field_name, arg, context):
+ cr.execute("SELECT box,sum(amount) from lunch_cashmove where active = 't' group by box")
+ r = dict(cr.fetchall())
+ for i in ids :
+ r.setdefault(i,0)
+ return r
+
+ _columns={
+ 'manager':fields.many2one('res.users','Manager'),
+ 'name':fields.char('Name',size=30,required=True, unique = True),
+ 'sum_remain': fields.function(amount_available, method=True, string='Remained Total'),
+ }
+
+lunch_cashbox()
+
+
+
+
+class lunch_cashmove(osv.osv):
+ _name= 'lunch.cashmove'
+
+ _columns={
+ 'name': fields.char('Name',size=128),
+ 'user_cashmove': fields.many2one('res.users','User Name', required=True),
+ 'amount': fields.float('Amount', digits=(16,2)),
+ 'box':fields.many2one('lunch.cashbox','Box Name',size=30,required=True),
+ 'active':fields.boolean('Active'),
+ 'create_date': fields.datetime('Created date', readonly=True),
+ }
+
+ _defaults={
+ 'active': lambda *a: True,
+ }
+
+lunch_cashmove()
+
+
+
+class lunch_order(osv.osv):
+ _name='lunch.order'
+ _rec_name= "user_id"
+
+ def _price_get(self, cr, uid, ids, name, args, context=None):
+ res = {}
+ for o in self.browse(cr, uid, ids):
+ res[o.id] = o.product.price
+ return res
+
+ _columns={
+ 'user_id': fields.many2one('res.users','User Name', required=True,
+ readonly=True, states={'draft':[('readonly',False)]}),
+ 'product':fields.many2one('lunch.product','Product', required=True,
+ readonly=True, states={'draft':[('readonly',False)]}, change_default=True),
+ 'date': fields.date('Date',readonly=True,states={'draft':[('readonly',False)]}),
+ 'cashmove':fields.many2one('lunch.cashmove', 'CashMove' , readonly=True ),
+ 'descript':fields.char('Description Order', readonly=True, size=50,
+ states={'draft':[('readonly',False)]}),
+ 'state': fields.selection([('draft','Draft'), ('confirmed','Confirmed'),],
+ 'State', readonly=True, select=True),
+ 'price': fields.function(_price_get, method=True, string="Price"),
+ }
+
+ _defaults={
+ 'user_id': lambda self,cr,uid,context: uid,
+ 'date': lambda self,cr,uid,context: time.strftime('%Y-%m-%d'),
+ 'state': lambda self,cr,uid,context: 'draft',
+ }
+
+ def confirm(self,cr,uid,ids,box,context):
+ cashmove_ref= self.pool.get('lunch.cashmove')
+ for order in self.browse(cr,uid,ids):
+ if order.state == 'confirmed':
+ continue
+ new_id= cashmove_ref.create(cr,uid,{'name': order.product.name+' order',
+ 'amount':-order.product.price,
+ 'user_cashmove':order.user_id.id,
+ 'box':box,
+ 'active':True,
+ })
+ self.write(cr,uid,[order.id],{'cashmove':new_id, 'state':'confirmed'})
+ return {}
+
+ def lunch_order_cancel(self,cr,uid,ids,context):
+ orders= self.browse(cr,uid,ids)
+ for order in orders:
+ if not order.cashmove:
+ continue
+ self.pool.get('lunch.cashmove').unlink(cr, uid, [order.cashmove.id])
+ self.write(cr,uid,ids,{'state':'draft'})
+ return {}
+
+ def onchange_product(self, cr, uid, ids, product):
+ if not product:
+ return {'value': {'price': 0.0}}
+ price = self.pool.get('lunch.product').read(cr, uid, product, ['price'])['price']
+ return {'value': {'price': price}}
+
+lunch_order()
+
+class report_lunch_amount(osv.osv):
+ _name='report.lunch.amount'
+ _description = "Amount available by user and box"
+ _auto = False
+ _rec_name= "user"
+
+ _columns = {
+ 'user_id': fields.many2one('res.users','User Name',readonly=True),
+ 'amount': fields.float('Amount', readonly=True, digits=(16,2)),
+ 'box':fields.many2one('lunch.cashbox','Box Name',size=30,readonly=True),
+ }
+
+ def init(self, cr):
+ cr.execute("""
+ create or replace view report_lunch_amount as (
+ select
+ min(lc.id) as id,
+ lc.user_cashmove as user_id,
+ sum(amount) as amount,
+ lc.box as box
+ from
+ lunch_cashmove lc
+ where
+ active = 't'
+ group by lc.user_cashmove, lc.box
+ )""")
+
+report_lunch_amount()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/lunch_demo.xml b/addons/lunch/lunch_demo.xml
new file mode 100644
index 00000000000..e26680f5253
--- /dev/null
+++ b/addons/lunch/lunch_demo.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+ Sandwich
+
+
+
+ Club
+
+ 2.75
+
+
+
+ Cashbox
+
+
+
+
diff --git a/addons/lunch/lunch_report.xml b/addons/lunch/lunch_report.xml
new file mode 100644
index 00000000000..3cdd8cb418c
--- /dev/null
+++ b/addons/lunch/lunch_report.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
new file mode 100644
index 00000000000..5862089067a
--- /dev/null
+++ b/addons/lunch/lunch_view.xml
@@ -0,0 +1,232 @@
+
+
+
+
+
+
+
+
+
+ Order
+ lunch.order
+
+
+
+
+
+
+ Order
+ lunch.order
+ tree
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Make order
+ lunch.order
+ form,tree
+
+
+
+
+ Order of the day
+ lunch.order
+ [('date','=',time.strftime('%Y-%m-%d'))]
+
+
+
+
+
+ CashBox
+ lunch.cashbox
+
+
+
+
+
+
+ CashBox
+ lunch.cashbox
+ tree
+
+
+
+
+
+
+
+
+
+
+ CashBox
+ lunch.cashbox
+
+
+
+
+ CashMove
+ lunch.cashmove
+
+
+
+
+
+
+ CashMove
+ lunch.cashmove
+ tree
+
+
+
+
+
+
+
+
+
+
+
+
+ CashMove
+ lunch.cashmove
+
+
+
+
+
+ Category of product
+ lunch.category
+
+
+
+
+
+
+ Category
+ lunch.category
+ tree
+
+
+
+
+
+
+
+
+
+ Category of product
+ lunch.category
+
+
+
+ Products
+ form
+ lunch.product
+
+
+
+
+
+
+
+ Products
+ lunch.product
+ tree
+
+
+
+
+
+
+
+
+
+
+
+ Product
+ lunch.product
+
+
+
+
+
+
+
+
+ Lunch amount
+ report.lunch.amount
+ tree
+
+
+
+
+
+
+
+
+
+
+ Lunch amount
+ report.lunch.amount
+ form
+
+
+
+
+
+
+
+ Lunch amount
+ report.lunch.amount
+ form
+ tree,form
+
+
+
+
+
+
diff --git a/addons/lunch/lunch_wizard.xml b/addons/lunch/lunch_wizard.xml
new file mode 100644
index 00000000000..ec9f7fea855
--- /dev/null
+++ b/addons/lunch/lunch_wizard.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/lunch/process/lunch_process.xml b/addons/lunch/process/lunch_process.xml
new file mode 100644
index 00000000000..4818d9d93f9
--- /dev/null
+++ b/addons/lunch/process/lunch_process.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/lunch/report/__init__.py b/addons/lunch/report/__init__.py
new file mode 100644
index 00000000000..efaffa8d307
--- /dev/null
+++ b/addons/lunch/report/__init__.py
@@ -0,0 +1,4 @@
+# -*- encoding: utf-8 -*-
+import order
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/report/order.py b/addons/lunch/report/order.py
new file mode 100644
index 00000000000..7824bade083
--- /dev/null
+++ b/addons/lunch/report/order.py
@@ -0,0 +1,53 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+import time
+from report import report_sxw
+from osv import osv
+
+
+class order(report_sxw.rml_parse):
+
+ def sum_price(self, orders):
+ res = 0.0
+ for o in orders:
+ res += o.price
+ return res
+
+ def __init__(self, cr, uid, name, context):
+ super(order, self).__init__(cr, uid, name, context)
+
+ self.localcontext.update({
+ 'time': time,
+ 'sum_price': self.sum_price,
+ })
+
+report_sxw.report_sxw('report.lunch.order', 'lunch.order',
+ 'addons/lunch/report/order.rml',parser=order, header=False)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml
new file mode 100644
index 00000000000..a7bc1b32cdd
--- /dev/null
+++ b/addons/lunch/report/order.rml
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Printed at : [[time.strftime("%Hh%M")]]
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Order
+ |
+
+ Description
+ |
+
+ Unit Price
+ |
+
+
+
+
+
+ |
+ [[repeatIn(objects, 'o') ]]
+ [[ o.user_id.name ]]
+ |
+
+ [[o.product.name ]]
+ |
+
+ [[ o.descript ]]
+
+
+
+ |
+
+ [['%.2f' % o.price ]]
+ |
+
+
+ |
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+ [[ '%.2f' % sum_price(objects) ]]
+ |
+
+
+
+
+
+
+
+
diff --git a/addons/lunch/wizard/__init__.py b/addons/lunch/wizard/__init__.py
new file mode 100644
index 00000000000..26328e41dc2
--- /dev/null
+++ b/addons/lunch/wizard/__init__.py
@@ -0,0 +1,6 @@
+# -*- encoding: utf-8 -*-
+import confirm
+import cancel
+import reset_box
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/wizard/cancel.py b/addons/lunch/wizard/cancel.py
new file mode 100644
index 00000000000..15ad6b96451
--- /dev/null
+++ b/addons/lunch/wizard/cancel.py
@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+
+import wizard
+import netsvc
+import ir
+import pooler
+
+cancel_form = """
+"""
+
+
+cancel_fields = {
+}
+
+def _cancel(self,cr,uid,data,context):
+ return pooler.get_pool(cr.dbname).get('lunch.order').lunch_order_cancel(cr,uid,data['ids'],context)
+
+class order_cancel(wizard.interface):
+ states = {
+ 'init': {
+ 'actions': [],
+ 'result': {'type':'form', 'arch':cancel_form, 'fields':cancel_fields, 'state':[('end','No'),('cancel','Yes')]}
+ },
+ 'cancel': {
+ 'actions': [_cancel],
+ 'result': {'type':'state', 'state':'end'}
+ }
+ }
+order_cancel('lunch.order.cancel')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/wizard/confirm.py b/addons/lunch/wizard/confirm.py
new file mode 100644
index 00000000000..6c42fb033c3
--- /dev/null
+++ b/addons/lunch/wizard/confirm.py
@@ -0,0 +1,67 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+import wizard
+import netsvc
+import ir
+import pooler
+
+confirm_order_form = """
+
+"""
+
+confirm_order_fields = {
+ 'confirm_cashbox': {'string':'Name of box', 'type':'many2one', 'required':True, 'relation':'lunch.cashbox' },
+}
+
+def _confirm(self,cr,uid,data,context):
+ pool= pooler.get_pool(cr.dbname)
+ order_ref = pool.get('lunch.order')
+ order_ref.confirm(cr,uid,data['ids'],data['form']['confirm_cashbox'],context)
+ return {}
+
+class order_confirm(wizard.interface):
+ states = {
+ 'init': {
+ 'action':[],
+ 'result':{'type' : 'form', 'arch' : confirm_order_form, 'fields' : confirm_order_fields, 'state' : [('end', 'Cancel'),('go', 'Confirm Order') ]},
+ },
+ 'go' : {
+ 'actions' : [_confirm],
+ 'result' : {'type' : 'state', 'state' : 'end'}
+ },
+ }
+order_confirm('lunch.order.confirm')
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/wizard/reset_box.py b/addons/lunch/wizard/reset_box.py
new file mode 100644
index 00000000000..643ecd3ad3f
--- /dev/null
+++ b/addons/lunch/wizard/reset_box.py
@@ -0,0 +1,56 @@
+# -*- encoding: utf-8 -*-
+import wizard
+import netsvc
+import ir
+import pooler
+
+set_to_zero_form = """
+"""
+
+
+
+confirm_setting_zero_fields = {}
+
+def _set_to_zero(self,cr,uid,data,context):
+ pool= pooler.get_pool(cr.dbname)
+ cashmove_ref = pool.get('lunch.cashmove')
+ cr.execute("select user_cashmove, box,sum(amount) from lunch_cashmove where active= 't' and box in (%s) group by user_cashmove, box"%','.join(map(str,data['ids'])))
+ res= cr.fetchall()
+ cr.execute("update lunch_cashmove set active = 'f' where active= 't' and box in (%s)"%','.join(map(str,data['ids'])))
+## to_unactive= {}.fromkeys([r[0] for r in cr.fetchall]).keys()
+## print to_unactive
+## cashmove_ref.write(cr,uid,to_unactive,{'active':False})
+##
+ for (user_id,box_id,amount) in res:
+ cashmove_ref.create(cr,uid,{'name': 'Summary for user'+ str(user_id),
+ 'amount': amount,
+ 'user_cashmove': user_id,
+ 'box': box_id,
+ 'active': True,
+ })
+ return {}
+
+
+class cashbox_set_to_zero(wizard.interface):
+
+ states = {
+
+ 'init': {
+ 'action':[],
+ 'result':{'type' : 'form',
+ 'arch' : set_to_zero_form,
+ 'fields' : confirm_setting_zero_fields,
+ 'state' : [('end', 'Cancel'),('zero', 'Set to Zero') ]},
+
+ },
+ 'zero' : {
+ 'actions' : [_set_to_zero],
+ 'result' : {'type' : 'state', 'state' : 'end'}
+ },
+ }
+
+cashbox_set_to_zero('lunch.cashbox.clean')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/membership/i18n/fr_FR.po b/addons/membership/i18n/fr_FR.po
index 0d9037c2652..0b3dd6ec9b7 100644
--- a/addons/membership/i18n/fr_FR.po
+++ b/addons/membership/i18n/fr_FR.po
@@ -4,16 +4,17 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 13:32+0000\n"
+"PO-Revision-Date: 2008-10-13 12:39+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-13 13:00+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: membership
#: view:product.product:0
@@ -23,7 +24,7 @@ msgstr "Information"
#. module: membership
#: field:membership.membership_line,account_invoice_line:0
msgid "Account Invoice line"
-msgstr ""
+msgstr "Ligne de Facture"
#. module: membership
#: model:ir.ui.menu,name:membership.menu_reporting
@@ -32,8 +33,11 @@ msgstr "Reporting"
#. module: membership
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: membership
#: constraint:membership.membership_line:0
@@ -43,28 +47,31 @@ msgstr ""
#. module: membership
#: wizard_button:wizard_invoice_membership,init,ok:0
msgid "Confirm"
-msgstr ""
+msgstr "Confirmer"
#. module: membership
#: selection:membership.membership_line,state:0
#: selection:res.partner,membership_state:0
msgid "Canceled Member"
-msgstr ""
+msgstr "Membre Annulé"
#. module: membership
#: constraint:product.template:0
-msgid "Error: The default UOM and the purchase UOM must be in the same category."
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
msgstr ""
+"Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent "
+"faire partie de la même catégorie"
#. module: membership
#: help:res.partner,membership_amount:0
msgid "The price negociated by the partner"
-msgstr ""
+msgstr "Le prix négocié par le partenaire"
#. module: membership
#: model:ir.model,name:membership.model_membership_membership_line
msgid "Member line"
-msgstr ""
+msgstr "Ligne de Membres"
#. module: membership
#: model:ir.ui.menu,name:membership.menu_membership_products
@@ -75,17 +82,17 @@ msgstr ""
#. module: membership
#: field:membership.membership_line,date_to:0
msgid "To"
-msgstr ""
+msgstr "A"
#. module: membership
#: field:membership.membership_line,state:0
msgid "State"
-msgstr ""
+msgstr "État"
#. module: membership
#: field:res.partner,membership_start:0
msgid "Start membership date"
-msgstr ""
+msgstr "Date de début d'adhésion"
#. module: membership
#: field:report.partner_member.year,invoiced_amount:0
@@ -93,29 +100,29 @@ msgstr ""
#: field:report.partner_member.year_new,invoiced_amount:0
#: field:report.partner_member.year_new,invoiced_number:0
msgid "Invoiced"
-msgstr ""
+msgstr "Facturée"
#. module: membership
#: selection:membership.membership_line,state:0
#: selection:res.partner,membership_state:0
msgid "Paid Member"
-msgstr ""
+msgstr "Membre Cotisant"
#. module: membership
#: field:membership.membership_line,date_from:0
msgid "From"
-msgstr ""
+msgstr "De"
#. module: membership
#: field:report.partner_member.year,currency:0
#: field:report.partner_member.year_new,currency:0
msgid "Currency"
-msgstr ""
+msgstr "Devise"
#. module: membership
#: field:product.product,membership_date_to:0
msgid "Date to"
-msgstr ""
+msgstr "Date de fin"
#. module: membership
#: model:ir.actions.act_window,name:membership.action_membership_products
@@ -127,13 +134,13 @@ msgstr ""
#: model:ir.ui.menu,name:membership.menu_report_partner_member_year
#: view:report.partner_member.year:0
msgid "Membership by Years"
-msgstr ""
+msgstr "Adhésion par Année"
#. module: membership
#: selection:membership.membership_line,state:0
#: selection:res.partner,membership_state:0
msgid "Free Member"
-msgstr ""
+msgstr "Membre Libre"
#. module: membership
#: field:report.partner_member.year_new,paid_amount:0
@@ -141,7 +148,7 @@ msgstr ""
#: field:report.partner_member.year,paid_amount:0
#: field:report.partner_member.year,paid_number:0
msgid "Paid"
-msgstr ""
+msgstr "Payé"
#. module: membership
#: field:res.partner,membership_amount:0
@@ -152,7 +159,7 @@ msgstr ""
#: selection:membership.membership_line,state:0
#: selection:res.partner,membership_state:0
msgid "Invoiced Member"
-msgstr ""
+msgstr "Membre Facturé"
#. module: membership
#: field:product.product,membership:0
@@ -161,7 +168,7 @@ msgstr ""
#: view:product.product:0
#: view:res.partner:0
msgid "Membership"
-msgstr ""
+msgstr "Adhésion"
#. module: membership
#: help:product.product,membership:0
@@ -172,18 +179,18 @@ msgstr ""
#: selection:membership.membership_line,state:0
#: selection:res.partner,membership_state:0
msgid "Non Member"
-msgstr ""
+msgstr "Non Membre"
#. module: membership
#: field:res.partner,membership_stop:0
msgid "Stop membership date"
-msgstr ""
+msgstr "Date de fin d'adhésion"
#. module: membership
#: selection:membership.membership_line,state:0
#: selection:res.partner,membership_state:0
msgid "Associated Member"
-msgstr ""
+msgstr "Membre Associé"
#. module: membership
#: model:ir.ui.menu,name:membership.menu_conf
@@ -194,38 +201,40 @@ msgstr "Configuration"
#: model:ir.actions.act_window,name:membership.action_membership_members_invoiced
#: model:ir.ui.menu,name:membership.menu_members_invoiced
msgid "Invoiced members"
-msgstr ""
+msgstr "Membres Facturés"
#. module: membership
#: model:product.pricelist,name:membership.list1m
msgid "Member Sale Pricelist"
-msgstr ""
+msgstr "Liste de Prix de Vente Membre"
#. module: membership
#: model:ir.actions.act_window,name:membership.action_membership_members
#: model:ir.ui.menu,name:membership.menu_members
msgid "Current members"
-msgstr ""
+msgstr "Membres actuels"
#. module: membership
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue"
#. module: membership
#: view:res.partner:0
msgid "Members"
-msgstr ""
+msgstr "Membres"
#. module: membership
#: constraint:product.template:0
msgid "Error: UOS must be in a different category than the UOM"
msgstr ""
+"Erreur: l'unité de vente doit appartenir à une catégorie différente que "
+"l'unité de mesure"
#. module: membership
#: field:res.partner,membership_cancel:0
msgid "Cancel membership date"
-msgstr ""
+msgstr "Annuler la date d'adhésion"
#. module: membership
#: view:res.partner:0
@@ -235,37 +244,37 @@ msgstr "Partenaire"
#. module: membership
#: model:ir.ui.menu,name:membership.menu_members_waiting
msgid "Future members (invoice not confirmed)"
-msgstr ""
+msgstr "Membres futurs (facture non confirmée)"
#. module: membership
#: selection:membership.membership_line,state:0
#: selection:res.partner,membership_state:0
msgid "Waiting Member"
-msgstr ""
+msgstr "Membre en attente"
#. module: membership
#: model:ir.model,name:membership.model_report_partner_member_year_new
#: model:ir.ui.menu,name:membership.menu_report_partner_member_year_new
#: view:report.partner_member.year_new:0
msgid "New Membership by Years"
-msgstr ""
+msgstr "Nouvelles adhésions par Année"
#. module: membership
#: model:ir.actions.act_window,name:membership.action_membership_members_old
#: model:ir.ui.menu,name:membership.menu_members_old
msgid "Old members"
-msgstr ""
+msgstr "Anciens Membres"
#. module: membership
#: model:ir.actions.act_window,name:membership.action_membership_members_associated
#: model:ir.ui.menu,name:membership.menu_members_associated
msgid "Associated members"
-msgstr ""
+msgstr "Membres Associés"
#. module: membership
#: field:res.partner,associate_member:0
msgid "Associate member"
-msgstr ""
+msgstr "Membre Associé"
#. module: membership
#: model:product.template,name:membership.member_product_1_product_template
@@ -285,35 +294,36 @@ msgstr ""
#. module: membership
#: wizard_view:wizard_invoice_membership,init:0
msgid "Choose invoice details"
-msgstr ""
+msgstr "Choisissez les détails de la facture"
#. module: membership
#: model:ir.actions.act_window,name:membership.action_membership_members_paid
#: model:ir.ui.menu,name:membership.menu_members_paid
msgid "Paid members"
-msgstr ""
+msgstr "Membres Cotisants"
#. module: membership
#: constraint:product.pricelist.version:0
msgid "You can not have 2 pricelist version that overlaps!"
msgstr ""
+"Vous ne pouvez pas avoir 2 version de listes de prix qui se chevauchent"
#. module: membership
#: selection:membership.membership_line,state:0
#: selection:res.partner,membership_state:0
msgid "Old Member"
-msgstr ""
+msgstr "Ancien Membre"
#. module: membership
#: field:product.template,member_price:0
#: model:product.price.type,name:membership.product_price_type_memberprice
msgid "Member Price"
-msgstr ""
+msgstr "Prix Membre"
#. module: membership
#: field:res.partner,free_member:0
msgid "Free member"
-msgstr ""
+msgstr "Membre Libre"
#. module: membership
#: field:report.partner_member.year_new,waiting_amount:0
@@ -321,7 +331,7 @@ msgstr ""
#: field:report.partner_member.year,waiting_amount:0
#: field:report.partner_member.year,waiting_number:0
msgid "Waiting"
-msgstr ""
+msgstr "En attente"
#. module: membership
#: model:product.template,name:membership.member_product_0_product_template
@@ -331,7 +341,7 @@ msgstr ""
#. module: membership
#: constraint:res.partner:0
msgid "The VAT doesn't seem to be correct."
-msgstr ""
+msgstr "Le numéro de TVA ne semble pas correct."
#. module: membership
#: field:report.partner_member.year,canceled_amount:0
@@ -339,52 +349,51 @@ msgstr ""
#: field:report.partner_member.year_new,canceled_amount:0
#: field:report.partner_member.year_new,canceled_number:0
msgid "Canceled"
-msgstr ""
+msgstr "Annulé"
#. module: membership
#: constraint:product.product:0
msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Erreur: code EAN invalide"
#. module: membership
#: field:product.product,membership_date_from:0
msgid "Date from"
-msgstr ""
+msgstr "Date de début"
#. module: membership
#: model:ir.actions.act_window,name:membership.action_membership_members_waiting
msgid "Future members"
-msgstr ""
+msgstr "Membres Futures"
#. module: membership
#: field:report.partner_member.year_new,year:0
#: field:report.partner_member.year,year:0
msgid "Year"
-msgstr ""
+msgstr "Année"
#. module: membership
#: wizard_button:wizard_invoice_membership,init,end:0
msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
#. module: membership
#: field:membership.membership_line,partner:0
msgid "Partner"
-msgstr ""
+msgstr "Partenaire"
#. module: membership
#: model:ir.actions.act_window,name:membership.action_membership_members_free
#: model:ir.ui.menu,name:membership.menu_members_free
msgid "Free members"
-msgstr ""
+msgstr "Membres Libres"
#. module: membership
#: field:res.partner,membership_state:0
msgid "Current membership state"
-msgstr ""
+msgstr "État de l'adhésion courante"
#. module: membership
#: field:membership.membership_line,date_cancel:0
msgid "Cancel date"
-msgstr ""
-
+msgstr "Date d'annulation"
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 5f488738e1a..1029118f32c 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -81,7 +81,7 @@
-
+
diff --git a/addons/membership/security/ir.model.access.csv b/addons/membership/security/ir.model.access.csv
index a641bd47522..de35a7c8adc 100644
--- a/addons/membership/security/ir.model.access.csv
+++ b/addons/membership/security/ir.model.access.csv
@@ -1,4 +1,5 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_membership_membership_line,membership.membership_line,model_membership_membership_line,base.group_user,1,1,1,1
-access_report_partner_member_year,report.partner_member.year,model_report_partner_member_year,base.group_user,1,0,0,0
-access_report_partner_member_year_new,report.partner_member.year_new,model_report_partner_member_year_new,base.group_user,1,0,0,0
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_membership_membership_line_partner_manager","membership.membership_line partner_manager","model_membership_membership_line","base.group_partner_manager",1,1,1,1
+"access_membership_membership_line","membership.membership_line","model_membership_membership_line",,1,0,0,0
+"access_report_partner_member_year","report.partner_member.year","model_report_partner_member_year","base.group_partner_manager",1,0,0,0
+"access_report_partner_member_year_new","report.partner_member.year_new","model_report_partner_member_year_new","base.group_partner_manager",1,0,0,0
diff --git a/addons/mrp/i18n/fr_FR.po b/addons/mrp/i18n/fr_FR.po
index 3e96a958e75..98d6df953dd 100644
--- a/addons/mrp/i18n/fr_FR.po
+++ b/addons/mrp/i18n/fr_FR.po
@@ -1,24 +1,26 @@
-# Translation of OpenERP Server.
-# This file containt the translation of the following modules:
-# * mrp
+# French translation for openobject-addons
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2008.
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 13:23+0000\n"
+"PO-Revision-Date: 2008-10-14 13:19+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: French \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-14 13:28+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp
#: field:mrp.workcenter,time_efficiency:0
msgid "Time Efficiency"
-msgstr "Efficacité temporelle"
+msgstr "Éfficacité dans le temps"
#. module: mrp
#: selection:mrp.procurement,state:0
@@ -33,7 +35,7 @@ msgstr "Mouvements créés"
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_bom_revision
msgid "Bill of material revisions"
-msgstr "Révisions de la nomenclature"
+msgstr "Révisions de la Nomenclature"
#. module: mrp
#: view:mrp.production:0
@@ -47,8 +49,13 @@ msgstr "Auteur"
#. module: mrp
#: help:mrp.bom,type:0
-msgid "Use a phantom bill of material in lines that have a sub-bom and that have to be automatically computed in one line, without habing two production orders."
-msgstr "Utilise une note de matériel fantôme ayant un sub-born et devant être calculé automatiquement en une ligne, sans avoir deux ordres de fabrication."
+msgid ""
+"Use a phantom bill of material in lines that have a sub-bom and that have to "
+"be automatically computed in one line, without habing two production orders."
+msgstr ""
+"Utilisez une nomenclature fantôme dans les lignes qui ont une sous-"
+"nomenclature et qui doivent être automatiquement calculée en une ligne, sans "
+"avoir deux ordres de production."
#. module: mrp
#: field:mrp.workcenter,costs_cycle:0
@@ -58,22 +65,28 @@ msgstr "Coût par cycle"
#. module: mrp
#: wizard_view:mrp.procurement.compute.all,init:0
msgid "Scheduler Parameters"
-msgstr "Paramètres du calcul des besoins"
+msgstr "Paramètres de la plannification"
#. module: mrp
#: view:mrp.procurement:0
msgid "Planification"
-msgstr ""
+msgstr "Planification"
#. module: mrp
#: rml:bom.structure:0
msgid "BOM"
-msgstr "BOM"
+msgstr "Nomenclature"
+
+#. module: mrp
+#: wizard_field:mrp.procurement.compute.all,init,user_id:0
+#: wizard_field:mrp.procurement.compute,init,user_id:0
+msgid "Send Result To"
+msgstr "Envoyer les résultats à"
#. module: mrp
#: field:mrp.bom.revision,indice:0
msgid "Revision"
-msgstr "Index"
+msgstr "Révision"
#. module: mrp
#: field:mrp.workcenter,costs_journal_id:0
@@ -81,101 +94,97 @@ msgid "Analytic Journal"
msgstr "Journal analytique"
#. module: mrp
-#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc2
-#: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc2
-msgid "Compute Stock Minimum Rules Only"
-msgstr ""
-
-#. module: mrp
-#: help:res.company,po_lead:0
-msgid "This is the leads/security time for each purchase order."
-msgstr ""
+#: view:mrp.procurement:0
+msgid "Details"
+msgstr "Détails"
#. module: mrp
#: field:mrp.production,location_dest_id:0
msgid "Finnished Products Location"
-msgstr ""
+msgstr "Localisation des Produits Finis"
#. module: mrp
-#: field:mrp.procurement,product_uos_qty:0
-msgid "UoS Quantity"
-msgstr ""
+#: wizard_field:mrp.procurement.compute.all,init,picking_lead:0
+#: wizard_field:mrp.procurement.compute,init,picking_lead:0
+msgid "Packing Lead Time"
+msgstr "Délai de colisage"
#. module: mrp
#: selection:mrp.workcenter,type:0
msgid "Human Resource"
-msgstr "Ressource humaine"
+msgstr "Resources Humaines"
#. module: mrp
#: wizard_button:mrp.procurement.compute.all,init,compute:0
#: wizard_button:mrp.procurement.compute,init,compute:0
#: wizard_button:mrp.procurement.orderpoint.compute,init,compute:0
msgid "Compute Procurements"
-msgstr "Calculer les besoins"
+msgstr "Calculer les Approvisionnements"
#. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Workcenters"
-msgstr "Centre de travail de routage"
+#: wizard_field:mrp.procurement.compute.all,init,po_lead:0
+#: wizard_field:mrp.procurement.compute,init,po_lead:0
+msgid "PO Lead Time"
+msgstr ""
#. module: mrp
#: field:mrp.procurement,date_close:0
msgid "Date Closed"
-msgstr "Date fermée"
+msgstr "Date de fin"
#. module: mrp
#: view:mrp.production:0
msgid "Finnished Products"
-msgstr ""
+msgstr "Produits Finis"
#. module: mrp
#: rml:bom.structure:0
msgid "UoM"
-msgstr "UoM"
+msgstr "UdM"
#. module: mrp
-#: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
-msgid "Production Order"
-msgstr "Ordre de fabrication"
+#: field:mrp.procurement,origin:0
+#: field:mrp.production,origin:0
+msgid "Origin"
+msgstr "Origine"
#. module: mrp
#: field:mrp.production.workcenter.line,hour:0
msgid "Nbr of hour"
-msgstr "Nb d'heure"
+msgstr "Nbr d'heures"
#. module: mrp
#: field:mrp.workcenter,time_start:0
msgid "Time before prod."
-msgstr "Temps avant prod."
+msgstr "Délai avant production"
#. module: mrp
#: field:mrp.bom,date_stop:0
msgid "Valid until"
-msgstr "Valide jusqu'à"
+msgstr "Valide jusqu'au"
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_routing_workcenter
msgid "Routing workcenter usage"
-msgstr "Utilisation de la gamme"
+msgstr "Usage des Centre de Travail d'Acheminement"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_routing_action
#: model:ir.ui.menu,name:mrp.menu_mrp_routing_action
msgid "Routings"
-msgstr ""
+msgstr "Acheminements"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_property_group_action
#: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
msgid "Property Categories"
-msgstr ""
+msgstr "Catégories de la Propriété"
#. module: mrp
-#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc1
-#: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc1
-msgid "Compute Procurements Only"
-msgstr ""
+#: field:mrp.procurement,purchase_id:0
+#: field:stock.warehouse.orderpoint,procurement_id:0
+msgid "Purchase Order"
+msgstr "Commande d'achat"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
@@ -188,77 +197,76 @@ msgstr "Nomenclature"
#. module: mrp
#: wizard_view:mrp.workcenter.load,init:0
msgid "Select time unit"
-msgstr "Sélectionner une unité de temps"
+msgstr "Sélectionner l'unité de temps"
#. module: mrp
#: constraint:mrp.bom:0
msgid "Error ! You can not create recursive BoM."
-msgstr ""
+msgstr "Erreur! Vous ne pouvez pas créer de nomenclatures récursives"
#. module: mrp
#: wizard_field:product_price,init,number:0
msgid "Number of products to produce"
-msgstr "Nombre de produits à produire"
-
-#. module: mrp
-#: field:res.company,manufacturing_lead:0
-msgid "Manufacturity Lead Time"
-msgstr ""
+msgstr "Nombre de produits à manufacturer"
#. module: mrp
#: field:stock.warehouse.orderpoint,logic:0
msgid "Reordering Mode"
-msgstr "Mode de cmde."
+msgstr "Mode de réagencement"
#. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
-msgid "Origin"
-msgstr "Origine"
+#: wizard_view:mrp.procurement.compute.all,init:0
+#: wizard_view:mrp.procurement.compute,init:0
+msgid "Control"
+msgstr "Contrôle"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_procurement_action4
#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action4
msgid "Exceptions procurements to fix"
-msgstr "Approvisionnements en exception à fixer"
+msgstr "Approvisionnement en Exception à Corriger"
#. module: mrp
#: model:ir.ui.menu,name:mrp.menu_mrp_reordering
msgid "Reordering Policy"
-msgstr "Politique de réapprovisionnement"
+msgstr "Politique de réagencement"
#. module: mrp
#: field:mrp.production,move_lines:0
msgid "Products Consummed"
-msgstr "Mouvements"
+msgstr "Produits consommés"
#. module: mrp
#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
msgid "Configuration"
msgstr "Configuration"
#. module: mrp
#: field:mrp.production,name:0
msgid "Reference"
-msgstr ""
+msgstr "Référence"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_procurement_action2
#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action2
msgid "Draft procurements"
-msgstr "Approvisionnements brouillons"
+msgstr "Approvisionnements Brouillon"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_procurement_action11
#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action11
msgid "Temporary Procurement Exceptions"
-msgstr ""
+msgstr "Approvisionnement en Exception Temporaire"
#. module: mrp
#: selection:mrp.bom,type:0
msgid "Normal BoM"
-msgstr "Nomenclature normale"
+msgstr "UdM Standard"
+
+#. module: mrp
+#: field:mrp.workcenter,time_cycle:0
+msgid "Time for 1 cycle (hour)"
+msgstr "Temps d'1 cycle (heures)"
#. module: mrp
#: field:mrp.bom,product_uos_qty:0
@@ -270,12 +278,12 @@ msgstr ""
#: wizard_field:mrp.procurement.compute.all,init,automatic:0
#: wizard_field:mrp.procurement.orderpoint.compute,init,automatic:0
msgid "Automatic orderpoint"
-msgstr "Point de commande automatique"
+msgstr ""
#. module: mrp
#: view:mrp.routing:0
msgid "Workcenter Operations"
-msgstr "Opérations"
+msgstr "Opérations du Centre de Travail"
#. module: mrp
#: view:mrp.bom:0
@@ -285,17 +293,17 @@ msgstr "Révisions"
#. module: mrp
#: field:mrp.property,composition:0
msgid "Properties composition"
-msgstr "Composition de propriétés"
+msgstr "Composition des Propriétés"
#. module: mrp
#: field:mrp.bom,product_efficiency:0
msgid "Product Efficiency"
-msgstr "Efficacité du produit"
+msgstr "Efficacité Produit"
#. module: mrp
#: model:ir.model,name:mrp.model_stock_warehouse_orderpoint
msgid "Orderpoint minimum rule"
-msgstr "Règle de stock minimum"
+msgstr ""
#. module: mrp
#: wizard_view:mrp.procurement.compute,init:0
@@ -312,7 +320,7 @@ msgstr "Confirmer"
#: rml:bom.structure:0
#: model:ir.actions.report.xml,name:mrp.report_bom_structure
msgid "BOM Structure"
-msgstr "Structure BOM"
+msgstr "Structure de la Nomenclature"
#. module: mrp
#: selection:mrp.production,state:0
@@ -322,12 +330,12 @@ msgstr "En production"
#. module: mrp
#: field:stock.warehouse.orderpoint,qty_multiple:0
msgid "Qty Multiple"
-msgstr "Multiple qté."
+msgstr "Multiple Qté"
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_production_workcenter_line
msgid "Production workcenters used"
-msgstr "Utilisation des postes de charge"
+msgstr "Centre de Travail de Production Utilisés"
#. module: mrp
#: field:mrp.procurement,priority:0
@@ -338,24 +346,24 @@ msgstr "Priorité"
#. module: mrp
#: selection:mrp.procurement,state:0
msgid "Waiting"
-msgstr ""
+msgstr "En attente"
#. module: mrp
#: field:mrp.production,workcenter_lines:0
msgid "Workcenters Utilisation"
-msgstr "Utilisation centre de travail"
+msgstr "Utilisation du Centre de Travail"
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_routing
#: field:mrp.bom,routing_id:0
#: view:mrp.routing:0
msgid "Routing"
-msgstr "Gamme"
+msgstr "Acheminement"
#. module: mrp
#: field:mrp.bom,product_rounding:0
msgid "Product Rounding"
-msgstr "Arrondi produit"
+msgstr ""
#. module: mrp
#: wizard_button:mrp.workcenter.load,init,report:0
@@ -365,7 +373,7 @@ msgstr "Imprimer"
#. module: mrp
#: selection:stock.warehouse.orderpoint,logic:0
msgid "Best price (not yet active!)"
-msgstr "Meilleur prix (pas encore activé)"
+msgstr "Meilleur Prix (pas encore actif!)"
#. module: mrp
#: field:mrp.workcenter,type:0
@@ -375,23 +383,18 @@ msgstr "Type"
#. module: mrp
#: view:mrp.procurement:0
msgid "Product & Location"
-msgstr ""
+msgstr "Produit & Localisation"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_procurement_new
#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_new
msgid "New Procurement"
-msgstr ""
-
-#. module: mrp
-#: view:res.company:0
-msgid "MRP & Logistic Scheduler"
-msgstr ""
+msgstr "Nouvel Approvisionnement"
#. module: mrp
#: view:mrp.production:0
msgid "Recreate Picking"
-msgstr "Recréer le colisage"
+msgstr "Recréer le coli"
#. module: mrp
#: view:mrp.bom:0
@@ -401,25 +404,20 @@ msgstr "Recréer le colisage"
#: view:mrp.routing.workcenter:0
#: view:mrp.workcenter:0
msgid "General Information"
-msgstr "Information générale"
+msgstr "Infos générales"
#. module: mrp
#: selection:mrp.workcenter,type:0
msgid "Tool"
msgstr "Outil"
-#. module: mrp
-#: help:res.company,manufacturing_lead:0
-msgid "Security days for each manufacturing operation."
-msgstr ""
-
#. module: mrp
#: field:mrp.bom,product_qty:0
#: field:mrp.production.product.line,product_qty:0
#: field:mrp.production,product_qty:0
#: field:mrp.production,product_uos_qty:0
msgid "Product Qty"
-msgstr "Qté produit"
+msgstr "Qté de Produit"
#. module: mrp
#: field:mrp.routing.workcenter,cycle_nbr:0
@@ -429,47 +427,37 @@ msgstr "Nombre de cycle"
#. module: mrp
#: rml:bom.structure:0
msgid "Product Name"
-msgstr "Nom du produit"
+msgstr "Nom du Produit"
#. module: mrp
#: view:mrp.procurement:0
msgid "References"
-msgstr ""
+msgstr "Références"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action_new
#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action_new
msgid "New Bill of Materials"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.workcenter,costs_cycle_account_id:0
-msgid "Cycle Account"
-msgstr "Compte cycle"
+msgstr "Nouvelle Nomenclature"
#. module: mrp
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue"
#. module: mrp
#: field:mrp.workcenter,time_stop:0
msgid "Time after prod."
-msgstr "Temps après prod."
+msgstr ""
#. module: mrp
#: wizard_field:mrp.workcenter.load,init,time_unit:0
msgid "Type of period"
-msgstr "Type de période"
+msgstr "Type de Période"
#. module: mrp
-#: field:mrp.production,picking_id:0
-msgid "Packing list"
-msgstr "Liste de colisage"
-
-#. module: mrp
-#: field:res.company,schedule_range:0
-msgid "Scheduler Range"
+#: field:mrp.workcenter,costs_cycle_account_id:0
+msgid "Cycle Account"
msgstr ""
#. module: mrp
@@ -480,12 +468,12 @@ msgstr "Valide depuis"
#. module: mrp
#: field:stock.warehouse.orderpoint,product_max_qty:0
msgid "Max Quantity"
-msgstr "Quantité max"
+msgstr "Quantité Max"
#. module: mrp
#: field:mrp.bom,revision_type:0
msgid "indice type"
-msgstr "Type d'index"
+msgstr "Type d'indice"
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_procurement
@@ -497,12 +485,12 @@ msgstr "Approvisionnement"
#: model:ir.actions.act_window,name:mrp.mrp_procurement_action
#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action
msgid "Procurement Orders"
-msgstr ""
+msgstr "Ordre d'Approvisionnement"
#. module: mrp
#: view:mrp.workcenter:0
msgid "Capacity Information"
-msgstr "Information de capacité"
+msgstr "Information sur la Capacité"
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_property
@@ -512,22 +500,28 @@ msgstr "Propriété"
#. module: mrp
#: field:mrp.routing.workcenter,routing_id:0
msgid "Parent Routing"
-msgstr "Routage parent"
+msgstr "Acheminement Parent"
#. module: mrp
#: model:ir.actions.wizard,name:mrp.wizard_price
msgid "Product Cost Structure"
-msgstr "Structure de coût du produit"
+msgstr "Structure de Coût du Produit"
#. module: mrp
-#: view:mrp.workcenter:0
-msgid "Analytic Accounting"
-msgstr "Comptabilité analytique"
+#: field:mrp.procurement,product_uos_qty:0
+msgid "UoS Quantity"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc2
+#: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc2
+msgid "Compute stock minimum rules"
+msgstr "Calculer les règles de stock minimum"
#. module: mrp
#: field:stock.warehouse.orderpoint,product_min_qty:0
msgid "Min Quantity"
-msgstr "Quantité min"
+msgstr "Quantité Min."
#. module: mrp
#: selection:mrp.procurement,priority:0
@@ -535,6 +529,11 @@ msgstr "Quantité min"
msgid "Urgent"
msgstr "Urgent"
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_root
+msgid "Production Management"
+msgstr "Gestion de la Production"
+
#. module: mrp
#: selection:mrp.property,composition:0
msgid "plus"
@@ -549,12 +548,12 @@ msgstr "Nomenclature"
#. module: mrp
#: view:mrp.bom:0
msgid "BoM Structure"
-msgstr "Structure de nomenclature"
+msgstr "Structure de la Nomenclature"
#. module: mrp
#: field:mrp.production,date_start:0
msgid "Start Date"
-msgstr "Date début"
+msgstr "Date de début"
#. module: mrp
#: field:mrp.workcenter,timesheet_id:0
@@ -564,54 +563,60 @@ msgstr "Feuille de présence"
#. module: mrp
#: selection:mrp.production,state:0
msgid "Waiting Goods"
-msgstr "Attente marchandises"
+msgstr "en attende de Marchandises"
#. module: mrp
#: field:mrp.workcenter,costs_hour_account_id:0
msgid "Hour Account"
-msgstr "Compte heure"
+msgstr "Compte Horaire"
#. module: mrp
#: selection:mrp.bom,revision_type:0
msgid "alphabetical indices"
-msgstr "Indexes alphabétiques"
+msgstr "Indices Alphabétiques"
#. module: mrp
#: field:mrp.production,product_lines:0
msgid "Scheduled goods"
-msgstr "Matériel planifié"
+msgstr "Biens Prévus"
#. module: mrp
#: view:mrp.procurement:0
msgid "Procurement Lines"
-msgstr "Lignes d'approvisionnement"
+msgstr "Lignes d'Approvisionnement"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_production_new
#: model:ir.ui.menu,name:mrp.menu_production_orders_new
msgid "New Production Order"
-msgstr ""
+msgstr "Nouvel Ordre de Production"
#. module: mrp
#: field:mrp.procurement,purchase_line_id:0
msgid "Purchase Order Line"
-msgstr "Détail d'une commande d'achat"
+msgstr "Ligne de commande"
#. module: mrp
#: field:mrp.bom.revision,last_indice:0
msgid "last indice"
-msgstr "Dernier index"
+msgstr "Dernier Indice"
#. module: mrp
#: field:mrp.bom,revision_ids:0
#: view:mrp.bom.revision:0
msgid "BoM Revisions"
-msgstr "Révisions de nomenclature"
+msgstr "Révisions des Nomenclatures"
+
+#. module: mrp
+#: wizard_field:mrp.procurement.compute.all,init,schedule_cycle:0
+#: wizard_field:mrp.procurement.compute,init,schedule_cycle:0
+msgid "Scheduler Cycle"
+msgstr "Cycle de Prévision"
#. module: mrp
#: view:mrp.procurement:0
msgid "Retry"
-msgstr "Réessayer"
+msgstr "Réessayez"
#. module: mrp
#: selection:mrp.procurement,state:0
@@ -625,9 +630,10 @@ msgid "Sets / Phantom"
msgstr ""
#. module: mrp
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+#: selection:mrp.procurement,priority:0
+#: selection:mrp.production,priority:0
+msgid "Not urgent"
+msgstr "Non urgent"
#. module: mrp
#: field:mrp.routing.workcenter,hour_nbr:0
@@ -635,21 +641,22 @@ msgid "Number of hours"
msgstr "Nombre d'heures"
#. module: mrp
-#: field:res.company,security_lead:0
+#: wizard_field:mrp.procurement.compute.all,init,security_lead:0
+#: wizard_field:mrp.procurement.compute,init,security_lead:0
msgid "Security Days"
-msgstr ""
+msgstr "Jours de sécurité"
#. module: mrp
#: field:mrp.bom,position:0
msgid "Internal Ref."
-msgstr "Position N°"
+msgstr "Réf. Interne"
#. module: mrp
#: field:mrp.procurement,state:0
#: field:mrp.production,state:0
#: view:mrp.procurement:0
msgid "Status"
-msgstr ""
+msgstr "État"
#. module: mrp
#: wizard_view:product_price,init:0
@@ -666,27 +673,28 @@ msgstr "Normal"
#: model:ir.actions.act_window,name:mrp.mrp_production_action2
#: model:ir.ui.menu,name:mrp.menu_production_orders_start
msgid "Production Orders To Start"
-msgstr ""
+msgstr "Ordres de Production à Commencer"
#. module: mrp
#: view:mrp.procurement:0
msgid "Procurement Details"
-msgstr ""
+msgstr "Détail de l'Approvisionnement"
#. module: mrp
#: selection:mrp.production,state:0
msgid "Ready to Produce"
-msgstr "Prêt à produire"
+msgstr "Prêt à Produire"
#. module: mrp
#: selection:mrp.production,state:0
msgid "Packing Exception"
-msgstr "Exception de colisage"
+msgstr "Exception de Colisage"
#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Modification"
+#: wizard_view:mrp.procurement.compute.all,init:0
+#: wizard_view:mrp.procurement.compute,init:0
+msgid "Time (days)"
+msgstr "Temps (jours)"
#. module: mrp
#: field:mrp.bom,active:0
@@ -694,17 +702,22 @@ msgstr "Modification"
#: field:mrp.workcenter,active:0
#: field:stock.warehouse.orderpoint,active:0
msgid "Active"
-msgstr "Active"
+msgstr "Actif"
+
+#. module: mrp
+#: field:mrp.bom.revision,name:0
+msgid "Modification name"
+msgstr "Nom de la Modification"
#. module: mrp
#: field:mrp.bom,type:0
msgid "BoM Type"
-msgstr "Type de nomenclature"
+msgstr "Type de Nomenclature"
#. module: mrp
#: field:mrp.bom,bom_id:0
msgid "Parent BoM"
-msgstr "Nomenclature parente"
+msgstr "Nomenclature Parente"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_property_action
@@ -721,7 +734,7 @@ msgstr "Propriétés"
#. module: mrp
#: field:mrp.workcenter,costs_hour:0
msgid "Cost per hour"
-msgstr "Coût par heure"
+msgstr "Coût horaire"
#. module: mrp
#: field:mrp.procurement,date_planned:0
@@ -730,53 +743,68 @@ msgid "Scheduled date"
msgstr "Date prévue"
#. module: mrp
-#: selection:mrp.procurement,state:0
-msgid "Exception"
-msgstr "Exception"
+#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc0
+#: model:ir.ui.menu,name:mrp.mrp_Sched_all
+msgid "Compute all schedulers"
+msgstr "Calculer toutes les prévisions"
#. module: mrp
#: selection:mrp.procurement,priority:0
#: selection:mrp.production,priority:0
msgid "Very Urgent"
-msgstr "Très urgent"
+msgstr "très Urgent"
#. module: mrp
#: field:mrp.procurement,procure_method:0
msgid "Procurement Method"
-msgstr "Méthode d'appro."
+msgstr "Méthode d'Approvisionnement"
#. module: mrp
#: field:mrp.production.workcenter.line,cycle:0
msgid "Nbr of cycle"
-msgstr "Nb de cycle"
+msgstr "Nbre de cycles"
#. module: mrp
#: view:mrp.procurement:0
#: view:mrp.production:0
msgid "Extra Information"
-msgstr ""
+msgstr "Information supplémentaire"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_production_action
#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
#: view:mrp.production:0
msgid "Production Orders"
-msgstr ""
+msgstr "Ordres de Production"
#. module: mrp
#: view:mrp.procurement:0
msgid "Run procurement"
-msgstr "Lancer l'approvisionnement"
+msgstr "Lancer l'Approvisionnement"
#. module: mrp
-#: help:res.company,schedule_range:0
-msgid "This is the time frame analysed by the scheduler when computing procurements. All procurement that are not between today and today+range are skipped for futur computation."
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Order to Max"
msgstr ""
#. module: mrp
#: help:mrp.bom,routing_id:0
-msgid "The list of operations (list of workcenters) to produce the finnished product. The routing is mainly used to compute workcenter costs during operations and to plan futur loads on workcenters based on production plannification."
-msgstr "La liste des opérations (liste des centres de travail) pour produire le produit fini. Le routage est principalement utilisé pour calculer les coûts de centre de travail pendant les opérations et pour planifier les charges futures sur les centres de travail sur base de la planification de production."
+msgid ""
+"The list of operations (list of workcenters) to produce the finnished "
+"product. The routing is mainly used to compute workcenter costs during "
+"operations and to plan futur loads on workcenters based on production "
+"plannification."
+msgstr ""
+"La liste des opérations (liste des Centres de Travail) pour produire le "
+"produit fini. L'acheminement est principalement utilisé pour calculer les "
+"coûts des centres de travail pendant les opérations et pour plannifier les "
+"charges futures sur les centres de travail basés sur la plannification de la "
+"production."
+
+#. module: mrp
+#: view:mrp.routing.workcenter:0
+msgid "Routing Workcenters"
+msgstr "Centre de Travail d'Acheminement"
#. module: mrp
#: rml:bom.structure:0
@@ -787,13 +815,13 @@ msgstr "Quantité"
#. module: mrp
#: view:mrp.production:0
msgid "Production done"
-msgstr "Production finie"
+msgstr "Production Effectuée"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
msgid "Bill of Materials"
-msgstr ""
+msgstr "Nomenclature"
#. module: mrp
#: field:mrp.workcenter,costs_general_account_id:0
@@ -812,35 +840,24 @@ msgstr "Code"
#: model:ir.actions.act_window,name:mrp.mrp_production_action4
#: model:ir.ui.menu,name:mrp.menu_production_orders_waiting4
msgid "Production Orders Waiting Products"
-msgstr ""
+msgstr "Ordres de Production en attente de Produits"
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_property_group
#: field:mrp.property,group_id:0
#: field:mrp.property.group,name:0
msgid "Property Group"
-msgstr "Groupe de propriété"
-
-#. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
-msgid "Not urgent"
-msgstr "Non urgent"
+msgstr "Groupe de Propriétés"
#. module: mrp
#: view:mrp.production:0
msgid "Confirm Production"
-msgstr "Confirmer la production"
-
-#. module: mrp
-#: help:res.company,security_lead:0
-msgid "This is the days added to what you promise to customers for security purpose"
-msgstr ""
+msgstr "Confirmer la Production"
#. module: mrp
#: selection:mrp.procurement,procure_method:0
msgid "from stock"
-msgstr "Depuis le stock"
+msgstr "du stock"
#. module: mrp
#: field:stock.move,procurements:0
@@ -851,12 +868,12 @@ msgstr "Approvisionnements"
#: selection:mrp.procurement,state:0
#: selection:mrp.production,state:0
msgid "Done"
-msgstr "Fait"
+msgstr "Terminé"
#. module: mrp
#: view:mrp.production.workcenter.line:0
msgid "Production Workcenters"
-msgstr "Centres de travail de production"
+msgstr "Centre de Travail de Production"
#. module: mrp
#: wizard_button:product_price,init,end:0
@@ -872,34 +889,53 @@ msgstr "Annuler"
#. module: mrp
#: field:mrp.procurement,location_id:0
-#: field:stock.warehouse.orderpoint,location_id:0
msgid "Location"
msgstr "Emplacement"
#. module: mrp
#: field:mrp.procurement,message:0
msgid "Latest error"
-msgstr "Dernière erreur"
+msgstr "Dernière Erreur"
#. module: mrp
-#: wizard_view:mrp.procurement.compute,init:0
-msgid "This wizard will schedule procurements."
+#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc1
+#: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc1
+msgid "Compute procurement"
+msgstr "Calculer l'Approvisionnement"
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Analytic Accounting"
+msgstr "Comptabilité Analytique"
+
+#. module: mrp
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_production_product_line
msgid "Production scheduled products"
-msgstr "Production planifiée de produits"
+msgstr "Produits plannifiés pour la production"
#. module: mrp
-#: field:mrp.workcenter,time_cycle:0
-msgid "Time for 1 cycle (hour)"
-msgstr "Tps. pour un cycle (hr)"
+#: field:mrp.production.product.line,production_id:0
+#: field:mrp.production.workcenter.line,production_id:0
+msgid "Production Order"
+msgstr "Ordre de Production"
+
+#. module: mrp
+#: selection:mrp.procurement,state:0
+msgid "Exception"
+msgstr "Exception"
#. module: mrp
#: field:mrp.production,move_prod_id:0
msgid "Move product"
-msgstr "Mouvement produit"
+msgstr "Déplacer le produit"
#. module: mrp
#: selection:mrp.workcenter,type:0
@@ -918,15 +954,16 @@ msgid "Production"
msgstr "Production"
#. module: mrp
-#: view:mrp.procurement:0
-msgid "Details"
+#: wizard_field:mrp.procurement.compute.all,init,po_cycle:0
+#: wizard_field:mrp.procurement.compute,init,po_cycle:0
+msgid "PO Cycle"
msgstr ""
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_production_action3
#: model:ir.ui.menu,name:mrp.menu_mrp_production_action3
msgid "Production Orders in Progress"
-msgstr ""
+msgstr "Ordres de Production en Marche"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.action_orderpoint_form
@@ -935,22 +972,22 @@ msgstr ""
#: model:ir.ui.menu,name:mrp.menu_action_orderpoint_form
#: view:stock.warehouse.orderpoint:0
msgid "Minimum Stock Rules"
-msgstr "Règles de stock minimum"
+msgstr "Règles de Stock Minimum"
#. module: mrp
#: view:mrp.production:0
msgid "Production orders"
-msgstr ""
+msgstr "Ordres de Production"
#. module: mrp
#: field:mrp.procurement,close_move:0
msgid "Close Move at end"
-msgstr "Clôturer le mouvement"
+msgstr ""
#. module: mrp
#: field:mrp.workcenter,capacity_per_cycle:0
msgid "Capacity per Cycle"
-msgstr "Capacité par cycle"
+msgstr "Capacité par Cycle"
#. module: mrp
#: field:mrp.bom,product_id:0
@@ -977,7 +1014,7 @@ msgstr "Description"
#. module: mrp
#: selection:mrp.production,state:0
msgid "Canceled"
-msgstr "Annulée"
+msgstr "Annulé"
#. module: mrp
#: rml:bom.structure:0
@@ -988,7 +1025,7 @@ msgstr "-"
#: field:mrp.bom,product_uos:0
#: field:mrp.production.product.line,product_uos:0
msgid "Product UOS"
-msgstr ""
+msgstr "UP Produit"
#. module: mrp
#: selection:mrp.procurement,state:0
@@ -1002,7 +1039,7 @@ msgstr "En cours"
#: field:mrp.production,product_uos:0
#: field:stock.warehouse.orderpoint,product_uom:0
msgid "Product UOM"
-msgstr "UDM de production"
+msgstr "UDM produit"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
@@ -1010,17 +1047,17 @@ msgstr "UDM de production"
#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
#: view:mrp.production:0
msgid "Workcenters"
-msgstr ""
+msgstr "Centres de Travail"
#. module: mrp
#: view:mrp.procurement:0
msgid "UOM"
-msgstr "UDM"
+msgstr "UdM"
#. module: mrp
#: field:mrp.bom,bom_lines:0
msgid "BoM Lines"
-msgstr "Lignes de nomenclature"
+msgstr "Lignes de Nomenclature"
#. module: mrp
#: selection:mrp.procurement,procure_method:0
@@ -1032,38 +1069,27 @@ msgstr "Sur commande"
msgid "Reservation"
msgstr "Réservation"
-#. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_root
-msgid "Manufacturing"
-msgstr ""
-
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_procurement_action3
#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action3
msgid "Unscheduled procurements"
-msgstr "Approvisonnements imprévus"
+msgstr "Approvisionnements non prévu"
#. module: mrp
#: view:mrp.production.lot.line:0
msgid "Production Products"
-msgstr "Produits de production"
+msgstr ""
#. module: mrp
#: field:mrp.production,date_finnished:0
msgid "End Date"
-msgstr "Date fin"
-
-#. module: mrp
-#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc0
-#: model:ir.ui.menu,name:mrp.mrp_Sched_all
-msgid "Compute All Schedulers"
-msgstr ""
+msgstr "Date de fin"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_bom_tree_action
#: model:ir.ui.menu,name:mrp.menu_bom_tree
msgid "Bill of Material Structure"
-msgstr ""
+msgstr "Structure de la Nomenclature"
#. module: mrp
#: field:mrp.bom,name:0
@@ -1081,7 +1107,7 @@ msgstr "Nom"
#. module: mrp
#: model:ir.actions.wizard,name:mrp.wizard_workcenter_load
msgid "Workcenter load"
-msgstr "Charge par poste"
+msgstr "Charge du Centre de Travail"
#. module: mrp
#: view:mrp.procurement:0
@@ -1097,7 +1123,7 @@ msgstr "max"
#: model:ir.actions.act_window,name:mrp.mrp_procurement_action5
#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action5
msgid "Exceptions procurements"
-msgstr "Approvisionnements par exception"
+msgstr "Approvisionnements en Exception"
#. module: mrp
#: field:mrp.procurement,product_uos:0
@@ -1107,22 +1133,17 @@ msgstr ""
#. module: mrp
#: field:mrp.production,location_src_id:0
msgid "Raw Products Location"
-msgstr ""
+msgstr "Emplacement des Produits Bruts"
#. module: mrp
#: view:mrp.production:0
msgid "Compute Data"
-msgstr "Calculer données"
-
-#. module: mrp
-#: view:mrp.production.lot.line:0
-msgid "Production Products Consommation"
-msgstr "Consommation de produits de production"
+msgstr "Calculer les Données"
#. module: mrp
#: field:mrp.procurement,product_uom:0
msgid "Product UoM"
-msgstr ""
+msgstr "UdM du Produit"
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_workcenter
@@ -1130,7 +1151,7 @@ msgstr ""
#: field:mrp.routing.workcenter,workcenter_id:0
#: view:mrp.workcenter:0
msgid "Workcenter"
-msgstr "Poste de charge"
+msgstr "Centre de Travail"
#. module: mrp
#: wizard_button:product_price,init,price:0
@@ -1138,20 +1159,19 @@ msgid "Print product price"
msgstr "Imprimer le prix du produit"
#. module: mrp
-#: field:mrp.procurement,purchase_id:0
-#: field:stock.warehouse.orderpoint,procurement_id:0
-msgid "Purchase Order"
-msgstr "Commande d'achat"
+#: field:mrp.production,picking_id:0
+msgid "Packing list"
+msgstr "Liste des Colisages"
#. module: mrp
#: view:mrp.production:0
msgid "Start Production"
-msgstr "Commencer la production"
+msgstr "Démarrer la Production"
#. module: mrp
#: wizard_field:mrp.workcenter.load,init,measure_unit:0
msgid "Amount measuring unit"
-msgstr "Unité de mesure"
+msgstr ""
#. module: mrp
#: field:mrp.bom.revision,date:0
@@ -1161,7 +1181,7 @@ msgstr "Date de modification"
#. module: mrp
#: view:mrp.property.group:0
msgid "Properties categories"
-msgstr "Catérogies de propriétés"
+msgstr "Catégories des Propriétés"
#. module: mrp
#: field:mrp.bom,sequence:0
@@ -1179,36 +1199,30 @@ msgstr "min"
#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
msgid "Bill of Materials Components"
-msgstr ""
+msgstr "Composants de la Nomenclature"
#. module: mrp
#: view:mrp.production:0
#: view:mrp.production.product.line:0
msgid "Scheduled Products"
-msgstr ""
+msgstr "Produits Plannifiés"
#. module: mrp
-#: field:res.company,po_lead:0
-msgid "Purchase Lead Time"
+#: view:mrp.production.lot.line:0
+msgid "Production Products Consommation"
msgstr ""
#. module: mrp
#: view:mrp.production:0
msgid "Consumed Products"
-msgstr ""
+msgstr "Produits Concommés"
#. module: mrp
#: selection:mrp.bom,revision_type:0
msgid "numeric indices"
-msgstr "Index numériques"
+msgstr "Indices Numériques"
#. module: mrp
#: field:mrp.routing,location_id:0
msgid "Production Location"
-msgstr "Emplacement de production"
-
-#. module: mrp
-#: selection:stock.warehouse.orderpoint,logic:0
-msgid "Order to Max"
-msgstr "Commander au max."
-
+msgstr "Emplacement de la Production"
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index e6139099b04..19965b42e67 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -902,7 +902,7 @@ class mrp_procurement(osv.osv):
return True
return False
- def action_confirm(self, cr, uid, ids):
+ def action_confirm(self, cr, uid, ids, context={}):
for procurement in self.browse(cr, uid, ids):
if procurement.product_id.type in ('product', 'consu'):
if not procurement.move_id:
@@ -1012,27 +1012,11 @@ class mrp_procurement(osv.osv):
'notes':product.description_purchase,
}
- taxes = self.pool.get('account.tax').browse(cr, uid,
- [x.id for x in procurement.product_id.product_tmpl_id.supplier_taxes_id])
- taxep = None
- if partner_id:
- taxep_id = self.pool.get('res.partner').property_get(cr, uid,partner_id,property_pref=['property_account_supplier_tax']).get('property_account_supplier_tax',False)
- if taxep_id:
- taxep=self.pool.get('account.tax').browse(cr, uid,taxep_id)
- if not taxep or not taxep.id:
- taxes_ids = [x.id for x in procurement.product_id.product_tmpl_id.supplier_taxes_id]
- else:
- res5 = [taxep.id]
- for t in taxes:
- if not t.tax_group==taxep.tax_group:
- res5.append(t.id)
- taxes_ids = res5
-
+ taxes_ids = procurement.product_id.product_tmpl_id.supplier_taxes_id
+ self.pool.get('account.fiscal.position').map_tax(cr, uid, partner, taxes)
line.update({
'taxes_id':[(6,0,taxes_ids)]
})
-
-
purchase_id = self.pool.get('purchase.order').create(cr, uid, {
'origin': procurement.origin,
'partner_id': partner_id,
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index bec2216b0c5..1d93353d4bd 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -27,9 +27,19 @@
form
tree,form
-
-
-
+
+
+
mrp.property.tree
@@ -65,7 +75,10 @@
form
tree,form
-
+
@@ -43,6 +42,7 @@
+
@@ -54,6 +54,7 @@
+
@@ -109,6 +110,7 @@
+
@@ -128,7 +130,7 @@
-
+
@@ -139,7 +141,7 @@
-
+
@@ -153,6 +155,7 @@
+
@@ -161,16 +164,25 @@
-
+
+
+ Process Transition
+ -->
+
+
+
+
+
+
+
+
@@ -215,6 +227,7 @@
+
@@ -251,6 +264,7 @@
+
@@ -260,6 +274,7 @@
+
@@ -298,5 +313,97 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/mrp/report/order.py b/addons/mrp/report/order.py
index 98f4bf1c0fb..6e2cf896660 100644
--- a/addons/mrp/report/order.py
+++ b/addons/mrp/report/order.py
@@ -39,4 +39,7 @@ class order(report_sxw.rml_parse):
})
-report_sxw.report_sxw('report.mrp.production.order','mrp.production','addons/mrp/report/order.rml',parser=order, header=2)
+
+report_sxw.report_sxw('report.mrp.production.order','mrp.production','addons/mrp/report/order.rml',parser=order,header=1)
+
+
diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml
index b9d62c5138f..341793ee79d 100644
--- a/addons/mrp/report/order.rml
+++ b/addons/mrp/report/order.rml
@@ -91,16 +91,19 @@
+
-
-
+
+
+
+
@@ -118,6 +121,7 @@
+
@@ -142,8 +146,10 @@
+
|
+
Printing date
|
@@ -157,6 +163,7 @@
|
Product Name
+
|
@@ -164,6 +171,7 @@
|
+
[[ time.strftime('%d/%m/%Y') ]]
|
@@ -177,10 +185,12 @@
|
[[ '['+ o.product_id.code +']' ]] [[ o.product_id.name ]]
+
|
+
@@ -200,10 +210,10 @@
|
[[ repeatIn(o.move_lines,'line') ]]
- [[ '['+line.product_id.code +']' ]][[ line.product_id.name ]]
+ [[ '['+line.product_id.code +']' ]] [[ line.product_id.name ]]
|
- [[ line.product_qty ]] [[line.product_uom.name]]
+ [[ '%.2f' % line.product_qty ]] [[line.product_uom.name]]
|
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 7785ce8bcfa..c3bacf6e833 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -1,21 +1,32 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_mrp_workcenter,mrp.workcenter,model_mrp_workcenter,mrp.group_mrp_user,1,0,0,0
-access_mrp_property_group,mrp.property.group,model_mrp_property_group,mrp.group_mrp_user,1,0,0,0
-access_mrp_property,mrp.property,model_mrp_property,mrp.group_mrp_user,1,0,0,0
-access_mrp_routing,mrp.routing,model_mrp_routing,mrp.group_mrp_user,1,0,0,0
-access_mrp_routing_workcenter,mrp.routing.workcenter,model_mrp_routing_workcenter,mrp.group_mrp_user,1,0,0,0
-access_mrp_bom,mrp.bom,model_mrp_bom,mrp.group_mrp_user,1,0,0,0
-access_mrp_bom_revision,mrp.bom.revision,model_mrp_bom_revision,mrp.group_mrp_user,1,0,0,0
-access_mrp_production,mrp.production,model_mrp_production,mrp.group_mrp_user,1,1,1,1
-access_mrp_production_workcenter_line,mrp.production.workcenter.line,model_mrp_production_workcenter_line,mrp.group_mrp_user,1,1,1,1
-access_mrp_production_product_line,mrp.production.product.line,model_mrp_production_product_line,mrp.group_mrp_user,1,1,1,1
-access_mrp_procurement,mrp.procurement,model_mrp_procurement,mrp.group_mrp_user,1,1,1,1
-access_stock_warehouse_orderpoint,stock.warehouse.orderpoint,model_stock_warehouse_orderpoint,mrp.group_mrp_user,1,0,0,0
-access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint.manager,model_stock_warehouse_orderpoint,mrp.group_mrp_user,1,1,1,1
-access_mrp_workcenter_manager,mrp.workcenter.manager,model_mrp_workcenter,mrp.group_mrp_user,1,1,1,1
-access_mrp_property_group_manager,mrp.property.group.manager,model_mrp_property_group,mrp.group_mrp_user,1,1,1,1
-access_mrp_property_manager,mrp.property.manager,model_mrp_property,mrp.group_mrp_user,1,1,1,1
-access_mrp_routing_manager,mrp.routing.manager,model_mrp_routing,mrp.group_mrp_user,1,1,1,1
-access_mrp_routing_workcenter_manager,mrp.routing.workcenter.manager,model_mrp_routing_workcenter,mrp.group_mrp_user,1,1,1,1
-access_mrp_bom_manager,mrp.bom.manager,model_mrp_bom,mrp.group_mrp_user,1,1,1,1
-access_mrp_bom_revision_manager,mrp.bom.revision.manager,model_mrp_bom_revision,mrp.group_mrp_user,1,1,1,1
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_mrp_workcenter","mrp.workcenter","model_mrp_workcenter","mrp.group_mrp_user",1,0,0,0
+"access_mrp_property_group","mrp.property.group","model_mrp_property_group","mrp.group_mrp_user",1,0,0,0
+"access_mrp_property","mrp.property","model_mrp_property","mrp.group_mrp_user",1,0,0,0
+"access_mrp_routing","mrp.routing","model_mrp_routing","mrp.group_mrp_user",1,0,0,0
+"access_mrp_routing_workcenter","mrp.routing.workcenter","model_mrp_routing_workcenter","mrp.group_mrp_user",1,0,0,0
+"access_mrp_bom","mrp.bom","model_mrp_bom","mrp.group_mrp_user",1,0,0,0
+"access_mrp_bom_revision","mrp.bom.revision","model_mrp_bom_revision","mrp.group_mrp_user",1,0,0,0
+"access_mrp_production","mrp.production","model_mrp_production","mrp.group_mrp_user",1,1,1,1
+"access_mrp_production_workcenter_line","mrp.production.workcenter.line","model_mrp_production_workcenter_line","mrp.group_mrp_user",1,1,1,1
+"access_mrp_production_product_line","mrp.production.product.line","model_mrp_production_product_line","mrp.group_mrp_user",1,1,1,1
+"access_mrp_procurement","mrp.procurement","model_mrp_procurement","mrp.group_mrp_user",1,1,1,1
+"access_stock_warehouse_orderpoint","stock.warehouse.orderpoint","model_stock_warehouse_orderpoint","mrp.group_mrp_user",1,0,0,0
+"access_stock_warehouse_orderpoint_manager","stock.warehouse.orderpoint.manager","model_stock_warehouse_orderpoint","mrp.group_mrp_manager",1,1,1,1
+"access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_user",1,1,1,1
+"access_mrp_property_group_manager","mrp.property.group.manager","model_mrp_property_group","mrp.group_mrp_user",1,1,1,1
+"access_mrp_property_manager","mrp.property.manager","model_mrp_property","mrp.group_mrp_user",1,1,1,1
+"access_mrp_routing_manager","mrp.routing.manager","model_mrp_routing","mrp.group_mrp_user",1,1,1,1
+"access_mrp_routing_workcenter_manager","mrp.routing.workcenter.manager","model_mrp_routing_workcenter","mrp.group_mrp_manager",1,1,1,1
+"access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_user",1,1,1,1
+"access_mrp_bom_revision_manager","mrp.bom.revision.manager","model_mrp_bom_revision","mrp.group_mrp_manager",1,1,1,1
+"access_stock_location_mrp_worker","stock.location mrp_worker","stock.model_stock_location","mrp.group_mrp_user",1,0,0,0
+"access_stock_move_mrp_worker","stock.move mrp_worker","stock.model_stock_move","mrp.group_mrp_user",1,1,1,1
+"access_stock_picking_mrp_worker","stock.picking mrp_worker","stock.model_stock_picking","mrp.group_mrp_user",1,1,1,1
+"access_stock_warehouse","stock.warehouse mrp_worker","stock.model_stock_warehouse","mrp.group_mrp_user",1,0,0,0
+"access_account_analytic_journal_mrp_worker","account.analytic.journal mrp_worker","account.model_account_analytic_journal","mrp.group_mrp_user",1,0,0,0
+"access_account_account","account.account mrp_worker","account.model_account_account","mrp.group_mrp_user",1,0,0,0
+"access_purchase_order_mrp_worker","purchase.order mrp_worker","purchase.model_purchase_order","mrp.group_mrp_user",1,0,0,0
+"access_purchase_order_line_mrp_worker","purchase.order.line mrp_worker","purchase.model_purchase_order_line","mrp.group_mrp_user",1,0,0,0
+"access_hr_timesheet_group_mrp_worker","hr.timesheet.group mrp_worker","hr.model_hr_timesheet_group","mrp.group_mrp_user",1,0,0,0
+"access_mrp_procurement_stock_worker","mrp.procurement stock_worker","model_mrp_procurement","stock.group_stock_user",1,0,0,0
+"access_mrp_production_stock_worker","mrp.production stock_worker","model_mrp_production","stock.group_stock_user",1,0,0,0
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index 9118fe051ae..8cd84d7df6b 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -1,6 +1,6 @@
-
+
Manufacturing / Manager
@@ -9,5 +9,12 @@
Manufacturing / Worker
+
+
+
+
+
+
+
diff --git a/addons/mrp_operations/i18n/fr_FR.po b/addons/mrp_operations/i18n/fr_FR.po
old mode 100755
new mode 100644
index 25a483c9e4e..cbba5fd91e4
--- a/addons/mrp_operations/i18n/fr_FR.po
+++ b/addons/mrp_operations/i18n/fr_FR.po
@@ -4,32 +4,36 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 16:29+0000\n"
+"PO-Revision-Date: 2008-10-13 13:44+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-13 13:52+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp_operations
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: mrp_operations
#: selection:mrp.production.workcenter.line,state:0
#: view:mrp.production.workcenter.line:0
msgid "Confirm"
-msgstr ""
+msgstr "Confirmer"
#. module: mrp_operations
#: selection:mrp_operations.operation.code,start_stop:0
msgid "Stop"
-msgstr ""
+msgstr "Arrêter"
#. module: mrp_operations
#: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
@@ -39,27 +43,27 @@ msgstr ""
#. module: mrp_operations
#: selection:mrp_operations.operation.code,start_stop:0
msgid "Start"
-msgstr ""
+msgstr "Démarrer"
#. module: mrp_operations
#: field:mrp_operations.operation,production_id:0
msgid "Production"
-msgstr ""
+msgstr "Production"
#. module: mrp_operations
#: selection:mrp.production.workcenter.line,state:0
msgid "Draft"
-msgstr ""
+msgstr "Brouillon"
#. module: mrp_operations
#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_confirm_action
msgid "Production Orders to Do"
-msgstr ""
+msgstr "Ordres de Production à Faire"
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
msgid "Set Draft"
-msgstr ""
+msgstr "Mettre en brouillon"
#. module: mrp_operations
#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_code_action
@@ -70,89 +74,79 @@ msgstr ""
#: field:mrp_operations.operation.code,start_stop:0
#: field:mrp.production.workcenter.line,state:0
msgid "Status"
-msgstr ""
+msgstr "État"
#. module: mrp_operations
#: rml:mrp.code.barcode:0
msgid ")"
-msgstr ""
+msgstr ")"
#. module: mrp_operations
#: rml:mrp.code.barcode:0
msgid "("
-msgstr ""
+msgstr "("
#. module: mrp_operations
#: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
msgid "Workcenters Barcode"
-msgstr ""
+msgstr "Code-barre des Centres de Travail"
#. module: mrp_operations
#: field:mrp.production.workcenter.line,delay:0
msgid "delay"
-msgstr ""
+msgstr "Délai"
#. module: mrp_operations
#: view:mrp_operations.operation:0
msgid "Production Operation"
-msgstr ""
+msgstr "Opération de Production"
#. module: mrp_operations
#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_draft_action
msgid "Waiting Production Orders"
-msgstr ""
+msgstr "Ordres de Production en attente"
#. module: mrp_operations
#: field:mrp_operations.operation.code,name:0
msgid "Operation Name"
-msgstr ""
-
-#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
-msgid "End Date"
-msgstr ""
-
-#. module: mrp_operations
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: mrp_operations
-#: field:mrp_operations.operation,workcenter_id:0
-msgid "Workcenter"
-msgstr ""
+msgstr "Nom de l'Opération"
#. module: mrp_operations
#: view:mrp_operations.operation.code:0
msgid "Production Operation Code"
-msgstr ""
+msgstr "Code d'Opération de Production"
+
+#. module: mrp_operations
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valide pour l'architecture de la vue"
+
+#. module: mrp_operations
+#: field:mrp_operations.operation,workcenter_id:0
+msgid "Workcenter"
+msgstr "Centre de Travail"
#. module: mrp_operations
#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action
msgid "Confirm Operations"
-msgstr ""
+msgstr "Confirmer les Opérations"
#. module: mrp_operations
#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_draft_action
msgid "Draft Operations"
-msgstr ""
-
-#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_start:0
-msgid "Start Date"
-msgstr ""
+msgstr "Opérations Brouillon"
#. module: mrp_operations
#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_operation_action
msgid "Operations"
-msgstr ""
+msgstr "Opérations"
#. module: mrp_operations
#: field:mrp_operations.operation.code,code:0
#: field:mrp_operations.operation,code_id:0
msgid "Code"
-msgstr ""
+msgstr "Code"
#. module: mrp_operations
#: model:ir.actions.report.xml,name:mrp_operations.report_code_barcode
@@ -162,14 +156,14 @@ msgstr ""
#. module: mrp_operations
#: selection:mrp.production.workcenter.line,state:0
msgid "Canceled"
-msgstr ""
+msgstr "Annulé"
#. module: mrp_operations
#: selection:mrp_operations.operation.code,start_stop:0
#: selection:mrp.production.workcenter.line,state:0
#: view:mrp.production.workcenter.line:0
msgid "Done"
-msgstr ""
+msgstr "Terminé"
#. module: mrp_operations
#: model:ir.model,name:mrp_operations.model_mrp_operations_operation
@@ -180,15 +174,14 @@ msgstr ""
#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action
#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_action
msgid "All Operations"
-msgstr ""
+msgstr "Toutes les Opérations"
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
#. module: mrp_operations
#: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action
msgid "Operation"
-msgstr ""
-
+msgstr "Opération"
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index d9063f6c2d1..a16808be3ac 100755
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -2,160 +2,160 @@
-
- mrp.production.workcenter.line.inherit.tree
- mrp.production.workcenter.line
-
- tree
-
-
-
-
-
-
-
-
-
-
-
-
+
+ mrp.production.workcenter.line.inherit.tree
+ mrp.production.workcenter.line
+
+ tree
+
+
+
+
+
+
+
+
+
+
+
+
-
- mrp.production.workcenter.line.form.inherit
- mrp.production.workcenter.line
- form
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ mrp.production.workcenter.line.form.inherit
+ mrp.production.workcenter.line
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
- Work Order
- ir.actions.act_window
- mrp.production.workcenter.line
- form
- tree,form
- [('id','=',active_id)]
-
+
+ Work Order
+ ir.actions.act_window
+ mrp.production.workcenter.line
+ form
+ tree,form
+ [('id','=',active_id)]
+
-
+
-
- All Work Order
- ir.actions.act_window
- mrp.production.workcenter.line
- form
- tree,form,graph
-
+
+ All Work Order
+ ir.actions.act_window
+ mrp.production.workcenter.line
+ form
+ tree,form,graph
+
-
+
-
- Confirm Work Order
- ir.actions.act_window
- mrp.production.workcenter.line
- form
- tree,form,graph
- [('state','=','confirm')]
-
+
+ Confirm Work Order
+ ir.actions.act_window
+ mrp.production.workcenter.line
+ form
+ tree,form,graph
+ [('state','=','confirm')]
+
-
+
-
- Draft Work Order
- ir.actions.act_window
- mrp.production.workcenter.line
- form
- tree,form,graph
- [('state','=','draft')]
-
+
+ Draft Work Order
+ ir.actions.act_window
+ mrp.production.workcenter.line
+ form
+ tree,form,graph
+ [('state','=','draft')]
+
-
-
-
- Work Order
-
-
+
+
+
+ Work Order
+
+
-
+
-
-
-
+
+
+
-
- mrp.production.code.tree
- mrp_operations.operation.code
- tree
-
-
-
-
-
-
-
-
+
+ mrp.production.code.tree
+ mrp_operations.operation.code
+ tree
+
+
+
+
+
+
+
+
-
- mrp.production.code.form
- mrp_operations.operation.code
- form
-
-
-
-
+
+ mrp.production.code.form
+ mrp_operations.operation.code
+ form
+
+
+
+
-
- Operations Code
- ir.actions.act_window
- mrp_operations.operation.code
- form
- tree,form
-
-
+
+ Operations Code
+ ir.actions.act_window
+ mrp_operations.operation.code
+ form
+ tree,form
+
+
-
+
-
- mrp.production.operation.tree
- mrp_operations.operation
- tree
-
-
-
-
-
-
-
-
-
-
-
+
+ mrp.production.operation.tree
+ mrp_operations.operation
+ tree
+
+
+
+
+
+
+
+
+
+
+
-
+
graph.in.hrs.workcenter
mrp.production.workcenter.line
graph
@@ -169,42 +169,46 @@
-
-
- Operations
- ir.actions.act_window
- mrp_operations.operation
- form
- tree,calendar,form
-
-
-
-
-
-
- mrp.perations.calendar
- mrp_operations.operation
- calendar
-
-
-
-
-
-
-
-
+
+ Operations
+ ir.actions.act_window
+ mrp_operations.operation
+ form
+ tree,calendar,form
+
+
+
+
+
+
+ mrp.perations.calendar
+ mrp_operations.operation
+ calendar
+
+
+
+
+
+
+
+
diff --git a/addons/partner_ldap/__init__.py b/addons/partner_ldap/__init__.py
new file mode 100644
index 00000000000..3ce9f39c009
--- /dev/null
+++ b/addons/partner_ldap/__init__.py
@@ -0,0 +1,5 @@
+# -*- encoding: utf-8 -*-
+import partner
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/partner_ldap/__terp__.py b/addons/partner_ldap/__terp__.py
new file mode 100644
index 00000000000..a04691edf52
--- /dev/null
+++ b/addons/partner_ldap/__terp__.py
@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+{
+ "name" : "Partner extension to synchronize TinyERP with ldap",
+ "version" : "1.0",
+ "author" : "Tiny",
+ "depends" : ["base", "hr", "process"],
+ "category" : "Generic Modules/Inventory Control",
+ "description": "Synchronise partners through a LDAP module. Has been used to synchronise partners in Outlook and Tiny ERP.",
+ "init_xml" : [],
+ "demo_xml" : [],
+ "update_xml" : ["wizard.xml",
+ "process/partner_ldap_process.xml"
+ ],
+ "active": False,
+ "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/partner_ldap/partner.py b/addons/partner_ldap/partner.py
new file mode 100644
index 00000000000..1bc3376356f
--- /dev/null
+++ b/addons/partner_ldap/partner.py
@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+from osv import osv, fields
+
+class address_ldap(osv.osv):
+ _inherit = 'res.partner.address'
+
+ _columns = {
+ 'dn' : fields.char('Distinguished name', size=128),
+ }
+
+address_ldap()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/partner_ldap/process/partner_ldap_process.xml b/addons/partner_ldap/process/partner_ldap_process.xml
new file mode 100644
index 00000000000..71b3a1d2182
--- /dev/null
+++ b/addons/partner_ldap/process/partner_ldap_process.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/partner_ldap/wizard.xml b/addons/partner_ldap/wizard.xml
new file mode 100644
index 00000000000..1785d5c7328
--- /dev/null
+++ b/addons/partner_ldap/wizard.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/addons/partner_ldap/wizard/__init__.py b/addons/partner_ldap/wizard/__init__.py
new file mode 100644
index 00000000000..4f0d100c6ac
--- /dev/null
+++ b/addons/partner_ldap/wizard/__init__.py
@@ -0,0 +1,4 @@
+# -*- encoding: utf-8 -*-
+import synchronize
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/partner_ldap/wizard/synchronize.py b/addons/partner_ldap/wizard/synchronize.py
new file mode 100644
index 00000000000..8cf96f9a727
--- /dev/null
+++ b/addons/partner_ldap/wizard/synchronize.py
@@ -0,0 +1,149 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+import sys
+if sys.version_info[:2] < (2, 4):
+ from sets import Set as set
+
+import time
+import ldap
+import ldap.modlist
+
+import wizard
+import pooler
+
+BASE_DN = 'ou=addressbook,dc=localdomain'
+
+def terp2ldap(data):
+ res = {}
+ for ldap_name, terp in LDAP_TERP_MAPPER.items():
+ if callable(terp) and terp(data):
+ res[ldap_name] = [terp(data)]
+ elif isinstance(terp, basestring) and data[terp]:
+ res[ldap_name] = ['%s' % data[terp]]
+ return res
+
+def get_lastname(dico):
+ lnames = dico['name'].split(' ', 1)[1:]
+ if lnames:
+ return ' '.join(lnames)
+ else:
+ return dico['name']
+
+def get_street(dico):
+ return ' '.join([dico[x] for x in ('street', 'street2') if dico[x]])
+
+def get_name(attribute):
+ def func(dico):
+ return dico[attribute][1]
+ return func
+
+
+LDAP_TERP_MAPPER = {
+ 'displayname': 'name',
+ 'mail': 'email',
+ 'o': get_name('partner_id'),
+ 'telephoneNumber': 'phone',
+ 'street': get_street,
+ 'postalcode': 'zip',
+ 'l': 'city',
+ 'cn': 'name',
+ 'sn': get_lastname,
+ 'uid': 'id',
+ }
+
+
+class sync_ldap(wizard.interface):
+
+ _login_arch = '''
+
+ '''
+
+ _login_fields = {
+ 'ldap_host': {'string': 'LDAP Host', 'type': 'char', 'size': 128},
+ 'dn': {'string': 'Distinguished name', 'type': 'char', 'size': 128},
+ 'password': {'string': 'Password', 'type': 'char', 'size': 128},
+ }
+
+ def _do_sync(self, cr, uid, data, context):
+ l = ldap.open(data['form']['ldap_host'])
+ l.simple_bind_s(data['form']['dn'], data['form']['password'])
+ ldap_objs = dict(l.search_s(BASE_DN, ldap.SCOPE_ONELEVEL, 'objectclass=*',
+ LDAP_TERP_MAPPER.keys()))
+ address = pooler.get_pool(cr.dbname).get('res.partner.address')
+ terp_objs = dict([(x['id'], x) for x in address.read(cr, uid, address.search(cr, uid, []))])
+ ldap_set = [int(x['uid'][0]) for x in ldap_objs.values()]
+ terp_set = terp_objs.keys()
+ for to_delete in ldap_set:
+ if to_delete in terp_set:
+ continue
+ l.delete_s('uid=%s,%s' % (to_delete, BASE_DN))
+ for to_add in terp_set:
+ if to_add in ldap_set:
+ continue
+ new_dn = 'uid=%s,%s' % (to_add, BASE_DN)
+ ldap_data = {'objectclass' : ['organizationalPerson', 'inetOrgPerson']}
+ ldap_data.update(terp2ldap(terp_objs[to_add]))
+ l.add_s(new_dn, ldap.modlist.addModlist(ldap_data))
+ address.write(cr, uid, [to_add], {'dn' : new_dn})
+ for to_update in terp_set:
+ if to_update not in ldap_set:
+ continue
+ current_dn = 'uid=%s,%s' % (to_update, BASE_DN)
+ modlist = ldap.modlist.modifyModlist(ldap_objs[current_dn], terp2ldap(terp_objs[to_update]))
+ if modlist:
+ l.modify_s(current_dn, modlist)
+ return {}
+
+ states = {
+ 'init' : {
+ 'actions' : [],
+ 'result' : {
+ 'type' : 'form',
+ 'arch' : _login_arch,
+ 'fields' : _login_fields,
+ 'state' : (('end', 'Cancel'),('sync', 'Synchronize'))
+ },
+ },
+ 'sync' : {
+ 'actions' : [ _do_sync ],
+ 'result' : { 'type' : 'state', 'state' : 'end' },
+ },
+ }
+
+
+sync_ldap('partners.sync_ldap')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/i18n/fr_FR.po b/addons/point_of_sale/i18n/fr_FR.po
index f3273f9ad65..d4592e134ca 100644
--- a/addons/point_of_sale/i18n/fr_FR.po
+++ b/addons/point_of_sale/i18n/fr_FR.po
@@ -4,113 +4,114 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:42+0000"
-"PO-Revision-Date: 2008-09-11 15:41:42+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 13:32+0000\n"
+"PO-Revision-Date: 2008-10-13 14:37+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-13 14:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: point_of_sale
+#: rml:pos.invoice:0
+msgid "Invoice Date:"
+msgstr "Date de Facture :"
#. module: point_of_sale
#: rml:pos.details_summary:0
#: rml:pos.details:0
msgid "Total paid"
-msgstr ""
+msgstr "Total Payé"
#. module: point_of_sale
#: rml:pos.details_summary:0
#: rml:pos.details:0
msgid "Qty of product"
-msgstr ""
+msgstr "Qté de Produits"
#. module: point_of_sale
#: view:pos.order:0
msgid "Set to draft"
-msgstr ""
+msgstr "Mettre en brouillon"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_report_transaction_pos
msgid "transaction for the pos"
-msgstr ""
+msgstr "Transaction du Point de vente"
#. module: point_of_sale
#: wizard_view:pos.discount,init:0
msgid "Discount :"
-msgstr ""
+msgstr "Remise :"
#. module: point_of_sale
#: field:pos.order,name:0
msgid "Order Description"
-msgstr ""
+msgstr "Description de la Commande"
#. module: point_of_sale
#: rml:pos.invoice:0
msgid "Document"
-msgstr ""
+msgstr "Document"
#. module: point_of_sale
#: wizard_view:pos.add_product,init:0
msgid "Add product :"
-msgstr ""
+msgstr "Ajouter Produit :"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_tree2
msgid "Orders of the day"
-msgstr ""
+msgstr "Commandes du jour"
#. module: point_of_sale
#: wizard_view:pos.sale.get,init:0
msgid "Select an Open Sale Order"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.invoice:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.invoice:0
-msgid "Total (inclu. taxes):"
-msgstr ""
+msgstr "Sélectionnez une Commande Ouverte"
#. module: point_of_sale
#: rml:pos.receipt:0
msgid ","
-msgstr ""
+msgstr ","
#. module: point_of_sale
#: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
msgid "Details of Sales"
-msgstr ""
+msgstr "Détail de la vente"
#. module: point_of_sale
#: rml:pos.invoice:0
msgid "Base"
-msgstr ""
+msgstr "Base"
+
+#. module: point_of_sale
+#: rml:pos.invoice:0
+msgid "Fax :"
+msgstr "Fax :"
#. module: point_of_sale
#: field:pos.order.line,price_subtotal:0
msgid "Subtotal"
-msgstr ""
+msgstr "Sous-total"
#. module: point_of_sale
#: wizard_view:pos.payment,ask_pay:0
msgid "Add payment :"
-msgstr ""
+msgstr "Ajouter un paiement :"
#. module: point_of_sale
#: field:pos.order,shop_id:0
msgid "Shop"
-msgstr ""
+msgstr "Magasin"
#. module: point_of_sale
#: wizard_button:pos.refund_order,init,refund_n_quit:0
msgid "Ok"
-msgstr ""
+msgstr "Ok"
#. module: point_of_sale
#: field:pos.order,last_out_picking:0
@@ -126,63 +127,63 @@ msgstr ""
#: field:pos.order,note:0
#: view:pos.order:0
msgid "Notes"
-msgstr ""
+msgstr "Notes"
#. module: point_of_sale
#: wizard_field:pos.sale.get,init,picking_id:0
msgid "Sale Order"
-msgstr ""
+msgstr "Commande client"
#. module: point_of_sale
#: rml:pos.details_summary:0
#: rml:pos.details:0
msgid "Detail of Sales"
-msgstr ""
+msgstr "Détail des Ventes"
#. module: point_of_sale
#: rml:pos.invoice:0
#: rml:pos.lines:0
#: field:pos.order,amount_tax:0
msgid "Taxes"
-msgstr ""
+msgstr "Taxes"
#. module: point_of_sale
#: field:report.transaction.pos,no_trans:0
msgid "Number of transaction"
-msgstr ""
+msgstr "Nombre de Transactions"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
msgid "Sale line"
-msgstr ""
+msgstr "Ligne de Vente"
#. module: point_of_sale
#: rml:pos.details_summary:0
#: rml:pos.details:0
msgid "Mode of Taxes"
-msgstr ""
+msgstr "Mode des Taxes"
#. module: point_of_sale
#: rml:pos.details:0
#: field:pos.config.journal,code:0
msgid "Code"
-msgstr ""
+msgstr "Code"
#. module: point_of_sale
#: wizard_field:pos.refund_order,init,date_validity:0
#: field:pos.order,date_validity:0
msgid "Validity Date"
-msgstr ""
+msgstr "Date de validité"
#. module: point_of_sale
-#: rml:pos.invoice:0
-msgid "Partner Code"
-msgstr ""
+#: wizard_field:pos.config.journal,init,default_journal_gift:0
+msgid "Default gift journal"
+msgstr "Journal des Bons par défaut"
#. module: point_of_sale
#: rml:pos.details:0
msgid "VAT"
-msgstr ""
+msgstr "TVA"
#. module: point_of_sale
#: model:ir.actions.wizard,name:point_of_sale.pos_refund
@@ -192,12 +193,12 @@ msgstr ""
#. module: point_of_sale
#: wizard_view:pos.config.journal,init:0
msgid "Select default journals"
-msgstr ""
+msgstr "Sélectionnez le Journal par défaut"
#. module: point_of_sale
#: rml:pos.invoice:0
msgid "Tax"
-msgstr ""
+msgstr "Taxe"
#. module: point_of_sale
#: view:report.transaction.pos:0
@@ -207,118 +208,108 @@ msgstr ""
#. module: point_of_sale
#: rml:pos.details:0
msgid "Disc"
-msgstr ""
+msgstr "Rem."
#. module: point_of_sale
#: rml:pos.lines:0
msgid "Journal:"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.invoice:0
-msgid "Fax :"
-msgstr ""
+msgstr "Journal :"
#. module: point_of_sale
#: field:pos.order,partner_id:0
msgid "Partner"
-msgstr ""
+msgstr "Partenaire"
#. module: point_of_sale
#: view:pos.order:0
msgid "Payments"
-msgstr ""
+msgstr "Paiements"
#. module: point_of_sale
#: field:pos.order,payments:0
msgid "Order Payments"
-msgstr ""
+msgstr "Paiements des commandes"
#. module: point_of_sale
#: rml:pos.receipt:0
msgid "Tel :"
-msgstr ""
+msgstr "Tél. :"
#. module: point_of_sale
#: rml:pos.details_summary:0
#: rml:pos.details:0
msgid "Total of the day"
-msgstr ""
+msgstr "Total du Jour"
#. module: point_of_sale
#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
#: wizard_button:pos.sale.get,init,set:0
msgid "Confirm"
-msgstr ""
+msgstr "Confirmer"
#. module: point_of_sale
#: view:pos.order:0
msgid "POS Orders"
-msgstr ""
+msgstr "Commandes Point de Vente"
#. module: point_of_sale
#: rml:pos.invoice:0
#: rml:pos.lines:0
msgid "Disc. (%)"
-msgstr ""
+msgstr "Rem. (%)"
#. module: point_of_sale
#: rml:pos.details_summary:0
#: rml:pos.details:0
msgid "Sales total"
-msgstr ""
+msgstr "Total des Ventes"
#. module: point_of_sale
#: rml:pos.invoice:0
msgid "Supplier Invoice"
-msgstr ""
+msgstr "Facture fournisseur"
#. module: point_of_sale
#: field:pos.order,state:0
msgid "State"
-msgstr ""
+msgstr "État"
#. module: point_of_sale
#: view:pos.order.line:0
msgid "Sum of subtotals"
-msgstr ""
+msgstr "Somme des sous-totaux"
#. module: point_of_sale
#: field:pos.order,lines:0
msgid "Order Lines"
-msgstr ""
-
-#. module: point_of_sale
-#: wizard_field:pos.config.journal,init,default_journal_gift:0
-msgid "Default gift journal"
-msgstr ""
+msgstr "Lignes de la commande"
#. module: point_of_sale
#: rml:pos.lines:0
msgid "Total Sold"
-msgstr ""
+msgstr "Total Vendu."
#. module: point_of_sale
#: rml:pos.receipt:0
msgid "User :"
-msgstr ""
+msgstr "Utilisateur :"
#. module: point_of_sale
#: rml:pos.details_summary:0
#: rml:pos.details:0
#: rml:pos.lines:0
msgid "Print Date:"
-msgstr ""
+msgstr "Date d'impression :"
#. module: point_of_sale
#: view:pos.order.line:0
msgid "POS Order lines"
-msgstr ""
+msgstr "Lignes de commandes Point de Vente"
#. module: point_of_sale
#: rml:pos.receipt:0
msgid "Total :"
-msgstr ""
+msgstr "Total :"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_point_rep
@@ -328,37 +319,37 @@ msgstr "Reporting"
#. module: point_of_sale
#: view:report.transaction.pos:0
msgid "POS "
-msgstr ""
+msgstr "Point de Vente "
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_config_journal
msgid "Point of Sale journal configuration."
-msgstr ""
+msgstr "Configuration des Journaux utilisés par les Points de Vente."
#. module: point_of_sale
#: field:pos.order,invoice_wanted:0
msgid "Create invoice"
-msgstr ""
+msgstr "Créer une facture"
#. module: point_of_sale
#: wizard_field:pos.config.journal,init,default_journal:0
msgid "Default journal"
-msgstr ""
+msgstr "Journal par défault"
#. module: point_of_sale
#: rml:pos.lines:0
msgid "Product Name"
-msgstr ""
+msgstr "Nom du Produit"
#. module: point_of_sale
#: field:pos.order,account_receivable:0
msgid "Default Receivable"
-msgstr ""
+msgstr "Recevable par défaut"
#. module: point_of_sale
#: model:ir.actions.wizard,name:point_of_sale.pos_sale_get
msgid "Get From Order"
-msgstr ""
+msgstr "Obtenir à partir d'une commande"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_point_config
@@ -368,48 +359,53 @@ msgstr "Configuration"
#. module: point_of_sale
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_line_day
msgid "POS Lines of the day"
-msgstr ""
+msgstr "Lignes du Point de Vente du Jour"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_wizard_default_journal
msgid "Default journals"
-msgstr ""
+msgstr "Journaux par défaut"
#. module: point_of_sale
#: field:pos.order.line,order_id:0
#: field:pos.payment,order_id:0
msgid "Order Ref"
-msgstr ""
+msgstr "Réf. Commande"
#. module: point_of_sale
#: rml:pos.invoice:0
msgid "Draft Invoice"
-msgstr ""
+msgstr "Facture brouillon"
#. module: point_of_sale
#: field:pos.order.line,discount:0
msgid "Discount (%)"
-msgstr ""
+msgstr "Ristourne (%)"
+
+#. module: point_of_sale
+#: rml:pos.invoice:0
+msgid "VAT :"
+msgstr "TVA :"
#. module: point_of_sale
#: model:ir.actions.wizard,name:point_of_sale.pos_add_product
msgid "Add products"
-msgstr ""
+msgstr "Ajouter des Produits"
#. module: point_of_sale
#: view:pos.order.line:0
msgid "Total qty"
-msgstr ""
+msgstr "Qté Totale"
#. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_line
-msgid "POS Lines"
-msgstr ""
+#: rml:pos.invoice:0
+msgid "(incl. taxes):"
+msgstr "(taxes incl.):"
#. module: point_of_sale
#: view:pos.order:0
@@ -419,7 +415,12 @@ msgstr ""
#. module: point_of_sale
#: wizard_button:pos.config.journal,init,set_default_journal:0
msgid "Define default journals"
-msgstr ""
+msgstr "Définir les journaux par défaut"
+
+#. module: point_of_sale
+#: rml:pos.invoice:0
+msgid "Tel. :"
+msgstr "Tél. :"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
@@ -429,48 +430,53 @@ msgstr ""
#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
#: model:ir.ui.menu,name:point_of_sale.menu_point_root
msgid "Point of Sale"
-msgstr ""
+msgstr "Point de Vente"
#. module: point_of_sale
#: field:pos.order,user_id:0
msgid "Salesman"
-msgstr ""
+msgstr "Vendeur"
#. module: point_of_sale
#: rml:pos.details:0
#: selection:pos.order,state:0
msgid "Invoiced"
-msgstr ""
+msgstr "Facturée"
#. module: point_of_sale
#: rml:pos.receipt:0
msgid "Date :"
-msgstr ""
+msgstr "Date :"
+
+#. module: point_of_sale
+#: rml:pos.invoice:0
+msgid "Partner Code:"
+msgstr "Code Partenaire :"
#. module: point_of_sale
#: rml:pos.lines:0
msgid "Total No. of Articles"
-msgstr ""
+msgstr "Nombre Total d'Articles"
#. module: point_of_sale
#: wizard_field:pos.config.journal,init,default_journal_rebate:0
msgid "Default rebate journal"
-msgstr ""
+msgstr "Journal des Remises par défaut"
#. module: point_of_sale
#: model:ir.actions.wizard,name:point_of_sale.wizard_default_journal
msgid "Wizard default journals"
-msgstr ""
+msgstr "Assistant des journaux par défaut"
#. module: point_of_sale
#: rml:pos.receipt:0
msgid "Disc :"
-msgstr ""
+msgstr "Rem :"
#. module: point_of_sale
#: selection:pos.order,state:0
msgid "Draft"
-msgstr ""
+msgstr "Brouillon"
#. module: point_of_sale
#: view:pos.order.line:0
@@ -480,94 +486,89 @@ msgstr ""
#. module: point_of_sale
#: rml:pos.lines:0
msgid "Total Taxes"
-msgstr ""
-
-#. module: point_of_sale
-#: rml:pos.invoice:0
-msgid "VAT :"
-msgstr ""
+msgstr "Taxes totales"
#. module: point_of_sale
#: rml:pos.invoice:0
msgid "PRO-FORMA"
-msgstr ""
+msgstr "PRO-FORMA"
#. module: point_of_sale
#: rml:pos.receipt:0
msgid "E-mail :"
-msgstr ""
+msgstr "E-mail :"
#. module: point_of_sale
#: rml:pos.details_summary:0
#: rml:pos.details:0
msgid "Total invoiced"
-msgstr ""
+msgstr "Total Facturé"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_trans_pos_tree_today
msgid "Sales of the day"
-msgstr ""
+msgstr "Ventes du jour"
#. module: point_of_sale
#: field:pos.order,amount_paid:0
#: field:pos.order,amount_return:0
msgid "unknown"
-msgstr ""
+msgstr "inconnu"
#. module: point_of_sale
#: selection:pos.order,state:0
msgid "Paid"
-msgstr ""
+msgstr "Payé"
#. module: point_of_sale
#: rml:pos.receipt:0
msgid "."
-msgstr ""
+msgstr "."
#. module: point_of_sale
#: model:ir.actions.wizard,name:point_of_sale.pos_discount
msgid "Discount"
-msgstr ""
+msgstr "Remise"
#. module: point_of_sale
#: field:report.transaction.pos,user_id:0
msgid "User"
-msgstr ""
+msgstr "Utilisateur"
#. module: point_of_sale
#: rml:pos.details:0
#: rml:pos.lines:0
#: field:report.transaction.pos,date_create:0
msgid "Date"
-msgstr ""
+msgstr "Date"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
msgid "Sales by user"
-msgstr ""
+msgstr "Ventes par utilisateur"
#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid ":"
-msgstr ""
+#: wizard_button:pos.discount,init,apply_discount:0
+msgid "Apply Discount"
+msgstr "Appliquer la Remise"
#. module: point_of_sale
#: rml:pos.details_summary:0
#: rml:pos.details:0
msgid "Period:"
-msgstr ""
+msgstr "Période :"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_trans_pos_tree
msgid "All the sales"
-msgstr ""
+msgstr "Toutes les ventes"
#. module: point_of_sale
#: view:pos.order:0
msgid "Compute"
-msgstr ""
+msgstr "Calculer"
#. module: point_of_sale
#: field:pos.order,pickings:0
@@ -577,71 +578,72 @@ msgstr ""
#. module: point_of_sale
#: field:pos.order.line,create_date:0
msgid "Creation date"
-msgstr ""
+msgstr "Date de création"
#. module: point_of_sale
#: rml:pos.details_summary:0
#: rml:pos.details:0
msgid "Total discount"
-msgstr ""
+msgstr "Remise totale"
#. module: point_of_sale
#: field:pos.order,pricelist_id:0
msgid "Pricelist"
-msgstr ""
+msgstr "Liste de prix"
#. module: point_of_sale
#: view:pos.order:0
msgid "Create _Invoice"
-msgstr ""
+msgstr "Créer Facture"
#. module: point_of_sale
#: rml:pos.invoice:0
#: wizard_field:pos.add_product,init,quantity:0
#: field:pos.order.line,qty:0
msgid "Quantity"
-msgstr ""
+msgstr "Quantité"
#. module: point_of_sale
#: rml:pos.invoice:0
msgid "Refund"
-msgstr ""
+msgstr "Remboursement"
#. module: point_of_sale
#: rml:pos.details_summary:0
#: rml:pos.details:0
msgid "Mode of payment"
-msgstr ""
+msgstr "Mode de paiement"
#. module: point_of_sale
#: wizard_button:pos.payment,ask_pay,add_pay:0
msgid "Ma_ke payment"
-msgstr ""
+msgstr "Effectuer le paiement"
#. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
-msgid "Apply Discount"
-msgstr ""
+#: rml:pos.invoice:0
+#: rml:pos.receipt:0
+msgid ":"
+msgstr ":"
#. module: point_of_sale
#: rml:pos.lines:0
msgid "Total Paid"
-msgstr ""
+msgstr "Total payé"
#. module: point_of_sale
#: rml:pos.details:0
msgid "VAT(%)"
-msgstr ""
+msgstr "TVA(%)"
#. module: point_of_sale
#: wizard_field:pos.discount,init,discount:0
msgid "Discount percentage"
-msgstr ""
+msgstr "Pourcentage de remise"
#. module: point_of_sale
#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
msgid "Receipt"
-msgstr ""
+msgstr "Reçu"
#. module: point_of_sale
#: wizard_view:pos.refund_order,init:0
@@ -652,17 +654,17 @@ msgstr ""
#: rml:pos.details:0
#: rml:pos.receipt:0
msgid "Qty"
-msgstr ""
+msgstr "Qté"
#. module: point_of_sale
#: view:pos.order:0
msgid "Other"
-msgstr ""
+msgstr "Autre"
#. module: point_of_sale
#: selection:pos.order,state:0
msgid "Done"
-msgstr ""
+msgstr "Terminé"
#. module: point_of_sale
#: rml:pos.invoice:0
@@ -671,7 +673,7 @@ msgstr ""
#: field:pos.order,invoice_id:0
#: field:report.transaction.pos,invoice_id:0
msgid "Invoice"
-msgstr ""
+msgstr "Facture"
#. module: point_of_sale
#: wizard_button:pos.add_product,init,end:0
@@ -683,77 +685,80 @@ msgstr ""
#: selection:pos.order,state:0
#: view:pos.order:0
msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
#. module: point_of_sale
#: view:pos.order:0
msgid "Close"
-msgstr ""
+msgstr "Fermer"
#. module: point_of_sale
#: view:pos.order:0
msgid "Order lines"
-msgstr ""
+msgstr "Lignes de commande"
#. module: point_of_sale
#: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
msgid "Sales (summary)"
-msgstr ""
+msgstr "Ventes (résumé)"
#. module: point_of_sale
#: field:pos.order.line,name:0
msgid "Line Description"
-msgstr ""
+msgstr "Description de la ligne"
#. module: point_of_sale
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: point_of_sale
#: view:pos.order:0
msgid "Ma_ke Payment"
-msgstr ""
+msgstr "Effectuer le paiement"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_payment
msgid "Pos Payment"
-msgstr ""
+msgstr "Paiement Point de Vente"
#. module: point_of_sale
#: rml:pos.invoice:0
#: rml:pos.lines:0
#: field:pos.order.line,price_unit:0
msgid "Unit Price"
-msgstr ""
+msgstr "Prix unitaire"
#. module: point_of_sale
#: wizard_view:pos.refund_order,init:0
msgid "Refund "
-msgstr ""
+msgstr "Remise "
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_order_line
msgid "Lines of Point of Sale"
-msgstr ""
+msgstr "Lignes de Points de Vente"
#. module: point_of_sale
#: rml:pos.invoice:0
msgid "Taxes:"
-msgstr ""
+msgstr "Taxes :"
#. module: point_of_sale
#: view:pos.order:0
#: view:report.transaction.pos:0
msgid "Amount total"
-msgstr ""
+msgstr "Montant total"
#. module: point_of_sale
#: rml:pos.details:0
#: wizard_field:pos.add_product,init,product:0
#: field:pos.order.line,product_id:0
msgid "Product"
-msgstr ""
+msgstr "Produit"
#. module: point_of_sale
#: rml:pos.invoice:0
@@ -761,112 +766,112 @@ msgstr ""
#: field:pos.config.journal,name:0
#: field:pos.payment,name:0
msgid "Description"
-msgstr ""
+msgstr "Description"
#. module: point_of_sale
#: field:pos.order,nb_print:0
msgid "Number of print"
-msgstr ""
+msgstr "Nombre d'impressions"
#. module: point_of_sale
#: rml:pos.invoice:0
#: rml:pos.details:0
#: rml:pos.receipt:0
msgid "Price"
-msgstr ""
+msgstr "Prix"
#. module: point_of_sale
#: rml:pos.invoice:0
msgid "Canceled Invoice"
-msgstr ""
+msgstr "Facture annulée"
#. module: point_of_sale
#: view:report.transaction.pos:0
msgid "POS"
-msgstr ""
+msgstr "Point de vente"
#. module: point_of_sale
#: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
msgid "Pos Lines"
msgstr ""
-#. module: point_of_sale
-#: rml:pos.invoice:0
-msgid "Tel. :"
-msgstr ""
-
#. module: point_of_sale
#: rml:pos.receipt:0
msgid "Operation N° :"
-msgstr ""
+msgstr "Operation N° :"
#. module: point_of_sale
#: model:ir.actions.wizard,name:point_of_sale.pos_payment
#: view:pos.order:0
msgid "Payment"
+msgstr "Paiement"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_line
+msgid "POS Lines"
msgstr ""
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_tree3
msgid "All orders"
-msgstr ""
+msgstr "Toutes les commandes"
#. module: point_of_sale
#: field:stock.picking,pos_order:0
msgid "Pos order"
-msgstr ""
+msgstr "Commande Point de Vente"
#. module: point_of_sale
#: rml:pos.lines:0
msgid "Name"
-msgstr ""
+msgstr "Nom"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_trans_pos_tree_month
msgid "Sales of the month"
-msgstr ""
+msgstr "Ventes du Mois"
#. module: point_of_sale
#: view:pos.order:0
msgid "D_iscount"
-msgstr ""
+msgstr "Remise"
#. module: point_of_sale
#: field:pos.order,date_order:0
msgid "Date Ordered"
-msgstr ""
+msgstr "Date de Commande"
#. module: point_of_sale
#: rml:pos.receipt:0
msgid "Ce bon est valide jusqu'au"
-msgstr ""
+msgstr "Ce bon est valide jusqu'au"
#. module: point_of_sale
#: rml:pos.invoice:0
msgid "Total (excl. taxes):"
-msgstr ""
+msgstr "Total (Hors Taxes) :"
#. module: point_of_sale
#: wizard_button:pos.add_product,init,add:0
#: view:pos.order:0
msgid "_Add product"
-msgstr ""
+msgstr "_Ajouter Produit"
#. module: point_of_sale
#: rml:pos.details_summary:0
#: rml:pos.details:0
msgid "Summary"
-msgstr ""
+msgstr "Résumé"
#. module: point_of_sale
#: view:pos.order:0
msgid "Invoicing"
-msgstr ""
+msgstr "Facturation"
#. module: point_of_sale
#: field:pos.order,account_move:0
msgid "Account Entry"
-msgstr ""
+msgstr "Écriture comptable"
#. module: point_of_sale
#: rml:pos.invoice:0
@@ -874,29 +879,30 @@ msgstr ""
#: field:pos.payment,amount:0
#: field:report.transaction.pos,amount:0
msgid "Amount"
-msgstr ""
+msgstr "Montant"
#. module: point_of_sale
#: view:pos.order:0
msgid "Actions"
-msgstr ""
+msgstr "Actions"
#. module: point_of_sale
#: rml:pos.details_summary:0
#: rml:pos.details:0
#: rml:pos.lines:0
msgid "Company:"
-msgstr ""
+msgstr "Société :"
#. module: point_of_sale
#: rml:pos.invoice:0
msgid "Supplier Refund"
-msgstr ""
+msgstr "Note de Crédit Fournisseur"
#. module: point_of_sale
+#: rml:pos.invoice:0
#: field:pos.order,amount_total:0
msgid "Total"
-msgstr ""
+msgstr "Total"
#. module: point_of_sale
#: wizard_field:pos.payment,ask_pay,journal:0
@@ -905,5 +911,4 @@ msgstr ""
#: field:pos.payment,journal_id:0
#: field:report.transaction.pos,journal_id:0
msgid "Journal"
-msgstr ""
-
+msgstr "Journal"
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 84caf98b877..f3f9df7842b 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -335,9 +335,11 @@ class pos_order(osv.osv):
self.pool.get('stock.move').create(cr, uid, {
'name': 'Stock move (POS %d)' % (order.id, ),
'product_uom': line.product_id.uom_id.id,
+ 'product_uos': line.product_id.uom_id.id,
'picking_id': picking_id,
'product_id': line.product_id.id,
'product_uos_qty': line.qty,
+ 'product_qty': line.qty,
'tracking_id': False,
'state': 'waiting',
'location_id': location_id,
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index 04469045410..36fa9c41d46 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -1,7 +1,14 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_pos_config_journal,pos.config.journal,model_pos_config_journal,point_of_sale.group_pos_user,1,0,0,0
-access_pos_order,pos.order,model_pos_order,point_of_sale.group_pos_user,1,1,1,1
-access_pos_order_line,pos.order.line,model_pos_order_line,point_of_sale.group_pos_user,1,1,1,1
-access_pos_payment,pos.payment,model_pos_payment,point_of_sale.group_pos_user,1,1,1,1
-access_report_transaction_pos,report.transaction.pos,model_report_transaction_pos,point_of_sale.group_pos_manager,1,0,0,0
-access_pos_config_journal_manager,pos.config.journal.manager,model_pos_config_journal,point_of_sale.group_pos_manager,1,1,1,1
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_pos_config_journal","pos.config.journal","model_pos_config_journal","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_order","pos.order","model_pos_order","point_of_sale.group_pos_user",1,1,1,1
+"access_pos_order_line","pos.order.line","model_pos_order_line","point_of_sale.group_pos_user",1,1,1,1
+"access_pos_payment","pos.payment","model_pos_payment","point_of_sale.group_pos_user",1,1,1,1
+"access_report_transaction_pos","report.transaction.pos","model_report_transaction_pos","point_of_sale.group_pos_manager",1,0,0,0
+"access_pos_config_journal_manager","pos.config.journal.manager","model_pos_config_journal","point_of_sale.group_pos_manager",1,1,1,1
+"access_account_journal_pos_manager","account.journal pos_manager","account.model_account_journal","point_of_sale.group_pos_manager",1,0,0,0
+"access_account_journal_pos_user","account.journal pos_user","account.model_account_journal","point_of_sale.group_pos_user",1,0,0,0
+"access_account_move_pos_user","account.move pos_user","account.model_account_move","point_of_sale.group_pos_user",1,0,0,0
+"access_account_account_pos_user","account.account pos_user","account.model_account_account","point_of_sale.group_pos_user",1,0,0,0
+"access_stock_picking_pos_user","stock.picking pos_user","stock.model_stock_picking","point_of_sale.group_pos_user",1,1,1,1
+"access_sale_shop_pos_user","sale.shop pos_user","sale.model_sale_shop","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_order_stock_worker","pos.order stock_worker","model_pos_order","stock.group_stock_user",1,0,0,0
diff --git a/addons/process/i18n/fr_FR.po b/addons/process/i18n/fr_FR.po
index 09d5cc50860..efb2294f76e 100644
--- a/addons/process/i18n/fr_FR.po
+++ b/addons/process/i18n/fr_FR.po
@@ -1,232 +1,232 @@
-# Translation of OpenERP Server.
-# This file containt the translation of the following modules:
-# * process
+# French translation for openobject-addons
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2008.
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:42+0000"
-"PO-Revision-Date: 2008-09-11 15:41:42+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2008-09-05 13:34+0000\n"
+"PO-Revision-Date: 2008-10-13 14:46+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: French \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-13 14:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
-#. module: process
-#: model:ir.actions.act_window,name:process.action_process_node_form
-#: model:ir.ui.menu,name:process.menu_partner_address_form
-#: view:process.node:0
-msgid "Process Node"
-msgstr ""
-
-#. module: process
+#. module: processus
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
-#. module: process
-#: view:process.node:0
-msgid "Node Description"
-msgstr ""
+#. module: processus
+#: model:ir.ui.menu,name:processus.menu_processus
+msgid "Enterprise Processus"
+msgstr "Processus d'entreprise"
-#. module: process
-#: field:process.node,menu_id:0
+#. module: processus
+#: field:processus.node,menu_id:0
msgid "Related Menu"
-msgstr ""
+msgstr "Menu Relatif"
-#. module: process
-#: field:process.transition,action_ids:0
+#. module: processus
+#: field:processus.transition,action_ids:0
msgid "Buttons"
-msgstr ""
+msgstr "Boutons"
-#. module: process
-#: selection:process.node,kind:0
+#. module: processus
+#: selection:processus.node,kind:0
msgid "State"
-msgstr ""
+msgstr "État"
-#. module: process
-#: field:process.transition,node_to_id:0
+#. module: processus
+#: field:processus.transition,node_to_id:0
msgid "Destination Node"
-msgstr ""
+msgstr "Noeud de Destination"
-#. module: process
-#: field:process.node,flow_start:0
+#. module: processus
+#: field:processus.node,flow_start:0
msgid "Starting Flow"
-msgstr ""
+msgstr "Flux de Départ"
-#. module: process
-#: model:ir.model,name:process.model_process_node
-msgid "Process Nodes"
-msgstr ""
-
-#. module: process
-#: field:process.process,node_ids:0
-#: view:process.process:0
+#. module: processus
+#: field:processus.processus,node_ids:0
+#: view:processus.processus:0
msgid "Nodes"
-msgstr ""
+msgstr "Nœuds"
-#. module: process
-#: field:process.transition.action,state:0
+#. module: processus
+#: field:processus.transition.action,state:0
msgid "Type"
-msgstr ""
+msgstr "Type"
-#. module: process
-#: selection:process.transition.action,state:0
+#. module: processus
+#: selection:processus.transition.action,state:0
msgid "Workflow Trigger"
-msgstr ""
+msgstr "Déclenchement du Flux d'Entreprise"
-#. module: process
-#: field:process.transition,note:0
-#: view:process.node:0
-#: view:process.transition:0
+#. module: processus
+#: field:processus.transition,note:0
+#: view:processus.node:0
+#: view:processus.transition:0
msgid "Description"
-msgstr ""
+msgstr "Description"
-#. module: process
-#: model:ir.model,name:process.model_process_transition_action
-msgid "Process Transitions Actions"
-msgstr ""
-
-#. module: process
-#: field:process.node,model_id:0
+#. module: processus
+#: field:processus.node,model_id:0
msgid "Object"
-msgstr ""
+msgstr "Objet"
-#. module: process
-#: field:process.transition,transition_ids:0
+#. module: processus
+#: field:processus.transition,transition_ids:0
msgid "Workflow Transitions"
-msgstr ""
+msgstr "Transitions du Flux de Travail"
-#. module: process
-#: model:ir.actions.report.xml,name:process.report_process
-msgid "Print Process"
-msgstr ""
+#. module: processus
+#: field:processus.node,kind:0
+msgid "Kind of Node"
+msgstr "Type de Noeud"
-#. module: process
-#: field:process.process,active:0
-msgid "Active"
-msgstr ""
+#. module: processus
+#: field:processus.transition.action,action:0
+msgid "Action ID"
+msgstr "ID de l'Action"
-#. module: process
-#: field:process.node,model_states:0
+#. module: processus
+#: field:processus.node,model_states:0
msgid "States Expression"
msgstr ""
-#. module: process
-#: view:process.node:0
+#. module: processus
+#: view:processus.node:0
msgid "Outgoing Transitions"
-msgstr ""
+msgstr "Transitions sortantes"
-#. module: process
-#: selection:process.transition.action,state:0
+#. module: processus
+#: selection:processus.transition.action,state:0
msgid "Dummy"
-msgstr ""
+msgstr "Factice"
-#. module: process
+#. module: processus
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue"
-#. module: process
-#: field:process.node,name:0
-#: field:process.process,name:0
-#: field:process.transition.action,name:0
-#: field:process.transition,name:0
-msgid "Name"
-msgstr ""
-
-#. module: process
-#: field:process.node,transition_in:0
+#. module: processus
+#: field:processus.node,transition_in:0
msgid "Starting Transitions"
-msgstr ""
+msgstr "Transitions de Départ"
-#. module: process
-#: field:process.node,note:0
-#: field:process.process,note:0
+#. module: processus
+#: field:processus.node,note:0
+#: field:processus.processus,note:0
msgid "Notes"
-msgstr ""
+msgstr "Notes"
-#. module: process
-#: field:process.transition.action,transition_id:0
+#. module: processus
+#: field:processus.transition.action,transition_id:0
msgid "Transition"
-msgstr ""
+msgstr "Transition"
-#. module: process
-#: selection:process.node,kind:0
+#. module: processus
+#: selection:processus.node,kind:0
msgid "Subflow"
-msgstr ""
+msgstr "Sous-flux"
-#. module: process
-#: view:process.node:0
-msgid "Extra Information"
-msgstr ""
+#. module: processus
+#: model:ir.actions.act_window,name:processus.action_processus_node_form
+#: model:ir.ui.menu,name:processus.menu_partner_address_form
+#: view:processus.node:0
+msgid "Processus Node"
+msgstr "Noeud de Processus"
-#. module: process
-#: field:process.transition.action,action:0
-msgid "Action ID"
-msgstr ""
+#. module: processus
+#: model:ir.actions.report.xml,name:processus.report_processus
+msgid "Print Processus"
+msgstr "Imprimer Processus"
-#. module: process
-#: selection:process.transition.action,state:0
+#. module: processus
+#: selection:processus.transition.action,state:0
msgid "Action"
-msgstr ""
+msgstr "Action"
-#. module: process
-#: selection:process.node,kind:0
+#. module: processus
+#: selection:processus.node,kind:0
msgid "Router"
msgstr ""
-#. module: process
-#: field:process.node,transition_out:0
-msgid "Ending Transitions"
-msgstr ""
+#. module: processus
+#: view:processus.node:0
+msgid "Node Description"
+msgstr "Description du Noeud"
-#. module: process
-#: model:ir.actions.act_window,name:process.action_transition_open
-#: model:ir.model,name:process.model_process_transition
-#: model:ir.ui.menu,name:process.menu_action_transition_open
-msgid "Process Transitions"
-msgstr ""
-
-#. module: process
-#: model:ir.ui.menu,name:process.menu_process
-msgid "Enterprise Process"
-msgstr ""
-
-#. module: process
-#: view:process.transition:0
-msgid "Actions"
-msgstr ""
-
-#. module: process
-#: field:process.transition,node_from_id:0
-msgid "Origin Node"
-msgstr ""
-
-#. module: process
-#: model:ir.model,name:process.model_process_process
-#: field:process.node,process_id:0
-#: model:ir.ui.menu,name:process.menu_process_form
-#: view:process.process:0
-msgid "Process"
-msgstr ""
-
-#. module: process
-#: field:process.node,kind:0
-msgid "Kind of Node"
-msgstr ""
-
-#. module: process
-#: view:process.node:0
-#: view:process.transition:0
+#. module: processus
+#: field:processus.transition.action,name:0
+#: field:processus.transition,name:0
+#: view:processus.node:0
+#: view:processus.transition:0
msgid "Transitions"
-msgstr ""
+msgstr "Transitions"
-#. module: process
-#: selection:process.transition.action,state:0
+#. module: processus
+#: field:processus.node,transition_out:0
+msgid "Ending Transitions"
+msgstr "Transitions finales"
+
+#. module: processus
+#: model:ir.model,name:processus.model_processus_processus
+#: field:processus.node,name:0
+#: field:processus.node,processus_id:0
+#: field:processus.processus,name:0
+#: model:ir.ui.menu,name:processus.menu_processus_form
+#: view:processus.processus:0
+msgid "Processus"
+msgstr "Processus"
+
+#. module: processus
+#: view:processus.transition:0
+msgid "Actions"
+msgstr "Actions"
+
+#. module: processus
+#: field:processus.transition,node_from_id:0
+msgid "Origin Node"
+msgstr "Noeud d'Origine"
+
+#. module: processus
+#: model:ir.model,name:processus.model_processus_transition_action
+msgid "Processus Transitions Actions"
+msgstr "Actions des Transitions du Processus"
+
+#. module: processus
+#: view:processus.node:0
+msgid "Extra Information"
+msgstr "Information supplémentaire"
+
+#. module: processus
+#: model:ir.actions.act_window,name:processus.action_transition_open
+#: model:ir.model,name:processus.model_processus_transition
+#: model:ir.ui.menu,name:processus.menu_action_transition_open
+msgid "Processus Transitions"
+msgstr "Transitions du Processus"
+
+#. module: processus
+#: model:ir.model,name:processus.model_processus_node
+msgid "Processus Nodes"
+msgstr "Noeuds de Processus"
+
+#. module: processus
+#: selection:processus.transition.action,state:0
msgid "Object Method"
-msgstr ""
+msgstr "Méthode de l'objet"
+#. module: processus
+#: field:processus.processus,active:0
+msgid "Active"
+msgstr "Actif"
diff --git a/addons/process/security/ir.model.access.csv b/addons/process/security/ir.model.access.csv
index 9d56bb541f0..064f0454d02 100644
--- a/addons/process/security/ir.model.access.csv
+++ b/addons/process/security/ir.model.access.csv
@@ -1,9 +1,11 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_process_process,process.process,model_process_process,base.group_user,1,0,0,0
-access_process_node,process.node,model_process_node,base.group_user,1,0,0,0
-access_process_transition,process.transition,model_process_transition,base.group_user,1,0,0,0
-access_process_transition_action,process.transition.action,model_process_transition_action,base.group_user,1,0,0,0
-access_process_process_manager,process.process,model_process_process,base.group_system,1,1,1,1
-access_process_node_manager,process.node,model_process_node,base.group_system,1,1,1,1
-access_process_transition_manager,process.transition,model_process_transition,base.group_system,1,1,1,1
-access_process_transition_action_manager,process.transition.action,model_process_transition_action,base.group_system,1,1,1,1
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_process_process","process.process","model_process_process","base.group_user",1,0,0,0
+"access_process_node","process.node","model_process_node","base.group_user",1,0,0,0
+"access_process_transition","process.transition","model_process_transition","base.group_user",1,0,0,0
+"access_process_transition_action","process.transition.action","model_process_transition_action","base.group_user",1,0,0,0
+"access_process_condition","process.condition","model_process_condition","base.group_user",1,0,0,0
+"access_process_process_manager","process.process manager","model_process_process","base.group_system",1,1,1,1
+"access_process_node_manager","process.node manager","model_process_node","base.group_system",1,1,1,1
+"access_process_transition_manager","process.transition manager","model_process_transition","base.group_system",1,1,1,1
+"access_process_transition_action_manager","process.transition.action manager","model_process_transition_action","base.group_system",1,1,1,1
+"access_process_condition_manager","process.condition manager","model_process_condition","base.group_system",1,1,1,1
diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml
index 9b675a11a84..d7e985eca7d 100644
--- a/addons/product/process/product_process.xml
+++ b/addons/product/process/product_process.xml
@@ -13,7 +13,7 @@
diff --git a/addons/product/product.py b/addons/product/product.py
index 8be135b4a68..757abb2df8a 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -535,6 +535,7 @@ class product_packaging(osv.osv):
_description = "Packaging"
_rec_name = 'ean'
_columns = {
+ 'sequence': fields.integer('Sequence'),
'name' : fields.char('Description', size=64),
'qty' : fields.float('Quantity by Package',
help="The total number of products you can put by palet or box."),
@@ -563,6 +564,7 @@ class product_packaging(osv.osv):
_defaults = {
'rows' : lambda *a : 3,
+ 'sequence' : lambda *a : 1,
'ul' : _get_1st_ul,
}
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 8d2a47f6836..a81fe9c3476 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -131,6 +131,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/project/project.py b/addons/project/project.py
index 55ed7b33df4..f27fa4f00c9 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -197,7 +197,7 @@ class project_task_type(osv.osv):
_name = 'project.task.type'
_description = 'Project task type'
_columns = {
- 'name': fields.char('Type', required=True, size=64),
+ 'name': fields.char('Type', required=True, size=64, translate=True),
'description': fields.text('Description'),
}
project_task_type()
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0f518ab67b2..12f9a17491f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -116,7 +116,7 @@
[('state','=','open')]
-
+
Template projects
@@ -125,6 +125,7 @@
[('state','=','template')]
+
@@ -184,7 +185,7 @@
My projects
project.project
tree
- [('manager', '=', uid)]
+ [('parent_id','=',False),('manager', '=', uid)]
@@ -194,7 +195,7 @@
My unclosed projects
project.project
tree
- [('manager', '=', uid),('state','<>','cancelled'),('state','<>','done')]
+ [('parent_id','=',False),('manager', '=', uid),('state','<>','cancelled'),('state','<>','done')]
@@ -204,7 +205,7 @@
My open projects
project.project
tree
- [('manager', '=', uid),('state','=','open')]
+ [('parent_id','=',False),('manager', '=', uid),('state','=','open')]
@@ -324,7 +325,7 @@
-
+
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index e5826a931ca..40f5cfdb94b 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -1,5 +1,8 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_project_project,project.project,model_project_project,project.group_project_user,1,1,1,1
-access_project_task_type,project.task.type,model_project_task_type,project.group_project_manager,1,1,1,1
-access_project_task,project.task,model_project_task,project.group_project_user,1,1,1,1
-access_project_task_work,project.task.work,model_project_task_work,project.group_project_user,1,1,1,1
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_project_project_manager","project.project manager","model_project_project","project.group_project_manager",1,1,1,1
+"access_project_project","project.project","model_project_project","project.group_project_user",1,1,1,1
+"access_project_task_type_user","project.task.type user","model_project_task_type","project.group_project_user",1,0,0,1
+"access_project_task_type","project.task.type","model_project_task_type","project.group_project_manager",1,1,1,1
+"access_project_task_manager","project.task manager","model_project_task","project.group_project_manager",1,1,1,1
+"access_project_task","project.task","model_project_task","project.group_project_user",1,1,1,1
+"access_project_task_work","project.task.work","model_project_task_work","project.group_project_user",1,1,1,1
diff --git a/addons/project_gtd/i18n/fr_FR.po b/addons/project_gtd/i18n/fr_FR.po
index bf7690fef09..b218633cdcb 100644
--- a/addons/project_gtd/i18n/fr_FR.po
+++ b/addons/project_gtd/i18n/fr_FR.po
@@ -4,36 +4,40 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 16:25+0000\n"
+"PO-Revision-Date: 2008-10-14 10:24+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-14 11:04+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: project_gtd
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: project_gtd
#: model:ir.model,name:project_gtd.model_project_gtd_timebox
msgid "project.gtd.timebox"
-msgstr ""
+msgstr "project.gtd.timebox"
#. module: project_gtd
#: field:project.gtd.timebox,context1_id:0
msgid "Context 1"
-msgstr ""
+msgstr "Contexte 1"
#. module: project_gtd
#: selection:project.gtd.timebox,type:0
msgid "Monthly"
-msgstr ""
+msgstr "Mensuel"
#. module: project_gtd
#: field:project.gtd.timebox,parent_id:0
@@ -43,7 +47,7 @@ msgstr ""
#. module: project_gtd
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML invalide pour la Visualisation de l'Architecture"
#. module: project_gtd
#: wizard_field:project.gtd.timebox.fill,init,task_ids:0
@@ -53,18 +57,18 @@ msgstr "Sélection des tâches"
#. module: project_gtd
#: field:project.gtd.timebox,col_priority:0
msgid "Priority"
-msgstr ""
+msgstr "Priorité"
#. module: project_gtd
#: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_inbox
#: model:ir.ui.menu,name:project_gtd.menu_open_time_myinbox
msgid "My Inbox"
-msgstr ""
+msgstr "Ma boîte de réception"
#. module: project_gtd
#: field:project.gtd.timebox,context3_id:0
msgid "Context 3"
-msgstr ""
+msgstr "Contexte 3"
#. module: project_gtd
#: view:project.gtd.timebox:0
@@ -74,7 +78,7 @@ msgstr ""
#. module: project_gtd
#: field:project.gtd.timebox,context4_id:0
msgid "Context 4"
-msgstr ""
+msgstr "Contexte 4"
#. module: project_gtd
#: wizard_field:project.gtd.timebox.fill,init,timebox_to_id:0
@@ -84,7 +88,7 @@ msgstr "Définir dans la timebox"
#. module: project_gtd
#: field:project.gtd.timebox,type:0
msgid "Type"
-msgstr ""
+msgstr "Type"
#. module: project_gtd
#: model:ir.actions.act_window,name:project_gtd.open_gtd_task_inbox
@@ -101,13 +105,13 @@ msgstr ""
#. module: project_gtd
#: view:project.gtd.timebox:0
msgid "Visible Columns"
-msgstr ""
+msgstr "Colonnes visibles"
#. module: project_gtd
#: model:ir.actions.act_window,name:project_gtd.open_gtd_context_tree_my
#: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_my_contexts
msgid "My Contexts"
-msgstr ""
+msgstr "Mes Contextes"
#. module: project_gtd
#: wizard_view:project.gtd.timebox.fill,init:0
@@ -117,7 +121,7 @@ msgstr "Selection des tâches de la timebox"
#. module: project_gtd
#: field:project.gtd.timebox,col_effective_hours:0
msgid "Effective Hours"
-msgstr ""
+msgstr "Heures Effectives"
#. module: project_gtd
#: model:ir.actions.wizard,name:project_gtd.open_gtd_timebox_empty
@@ -137,7 +141,7 @@ msgstr ""
#. module: project_gtd
#: field:project.gtd.timebox,user_id:0
msgid "User"
-msgstr ""
+msgstr "Utilisateur"
#. module: project_gtd
#: model:ir.actions.wizard,name:project_gtd.open_gtd_timebox_daily
@@ -148,22 +152,22 @@ msgstr ""
#. module: project_gtd
#: model:ir.model,name:project_gtd.model_project_gtd_context
msgid "project.gtd.context"
-msgstr ""
+msgstr "project.gtd.context"
#. module: project_gtd
#: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_deadline_open
msgid "My Deadlines"
-msgstr ""
+msgstr "Mes dates limites"
#. module: project_gtd
#: field:project.gtd.timebox,context2_id:0
msgid "Context 2"
-msgstr ""
+msgstr "Contexte 2"
#. module: project_gtd
#: field:project.gtd.context,project_default_id:0
msgid "Default Project"
-msgstr ""
+msgstr "Projet par défaut"
#. module: project_gtd
#: wizard_button:project.gtd.timebox.fill,init,process:0
@@ -173,24 +177,24 @@ msgstr "Ajouter à la timebox"
#. module: project_gtd
#: field:project.gtd.timebox,context5_id:0
msgid "Context 5"
-msgstr ""
+msgstr "Contexte 5"
#. module: project_gtd
#: field:project.gtd.timebox,context6_id:0
msgid "Context 6"
-msgstr ""
+msgstr "Contexte 6"
#. module: project_gtd
#: model:ir.actions.act_window,name:project_gtd.open_gtd_context_tree
#: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_contexts
#: view:project.gtd.timebox:0
msgid "Contexts"
-msgstr ""
+msgstr "Contextes"
#. module: project_gtd
#: selection:project.gtd.timebox,type:0
msgid "Daily"
-msgstr ""
+msgstr "Quotidien"
#. module: project_gtd
#: model:ir.actions.wizard,name:project_gtd.open_gtd_timebox_fill
@@ -200,7 +204,7 @@ msgstr ""
#. module: project_gtd
#: field:project.gtd.timebox,col_project:0
msgid "Project"
-msgstr ""
+msgstr "Projet"
#. module: project_gtd
#: wizard_button:project.gtd.timebox.fill,init,end:0
@@ -219,7 +223,7 @@ msgstr ""
#: field:project.task,context_id:0
#: view:project.gtd.context:0
msgid "Context"
-msgstr ""
+msgstr "Contexte"
#. module: project_gtd
#: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_open
@@ -241,28 +245,28 @@ msgstr "Tâches"
#. module: project_gtd
#: field:project.gtd.context,sequence:0
msgid "Sequence"
-msgstr ""
+msgstr "Séquence"
#. module: project_gtd
#: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time
#: model:ir.ui.menu,name:project_gtd.menu_open_time
msgid "Time Management"
-msgstr ""
+msgstr "Gestion du Temps"
#. module: project_gtd
#: selection:project.gtd.timebox,type:0
msgid "Other"
-msgstr ""
+msgstr "Autre"
#. module: project_gtd
#: field:project.gtd.timebox,col_deadline:0
msgid "Deadline"
-msgstr ""
+msgstr "Date limite"
#. module: project_gtd
#: view:project.task:0
msgid "Est. Hours"
-msgstr ""
+msgstr "Heures est."
#. module: project_gtd
#: wizard_field:project.gtd.timebox.fill,init,timebox_id:0
@@ -284,15 +288,14 @@ msgstr ""
#. module: project_gtd
#: field:project.gtd.timebox,col_date_start:0
msgid "Date Start"
-msgstr ""
+msgstr "Date de début"
#. module: project_gtd
#: field:project.gtd.timebox,col_planned_hours:0
msgid "Planned Hours"
-msgstr ""
+msgstr "Heures planifiés"
#. module: project_gtd
#: selection:project.gtd.timebox,type:0
msgid "Weekly"
-msgstr ""
-
+msgstr "Hebdomadaire"
diff --git a/addons/project_gtd/project_gtd_wizard.xml b/addons/project_gtd/project_gtd_wizard.xml
index 03503303311..003245aaf40 100644
--- a/addons/project_gtd/project_gtd_wizard.xml
+++ b/addons/project_gtd/project_gtd_wizard.xml
@@ -3,7 +3,7 @@
diff --git a/addons/project_mrp/i18n/fr_FR.po b/addons/project_mrp/i18n/fr_FR.po
index 512286216e8..3108a9f2cb3 100644
--- a/addons/project_mrp/i18n/fr_FR.po
+++ b/addons/project_mrp/i18n/fr_FR.po
@@ -4,14 +4,14 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:42+0000"
-"PO-Revision-Date: 2008-09-11 15:41:42+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-11 15:41:42+0000\n"
+"PO-Revision-Date: 2008-09-11 15:41:42+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml
index 0c856b7a96d..125d325f223 100644
--- a/addons/project_mrp/process/project_mrp_process.xml
+++ b/addons/project_mrp/process/project_mrp_process.xml
@@ -9,10 +9,11 @@
-
+
+
@@ -35,6 +36,7 @@
+
@@ -78,6 +80,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/project_mrp/security/ir.model.access.csv b/addons/project_mrp/security/ir.model.access.csv
new file mode 100644
index 00000000000..407ab3716a0
--- /dev/null
+++ b/addons/project_mrp/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_mrp_procurement_project_user","mrp.procurement project_user","model_mrp_procurement","project.group_project_user",1,1,1,1
+"access_mrp_procurement_project_manager","mrp.procurement project_manager","model_mrp_procurement","project.group_project_manager",1,1,1,1
diff --git a/addons/project_timesheet/i18n/fr_FR.po b/addons/project_timesheet/i18n/fr_FR.po
index a88c47adcc0..47892ea8f3f 100644
--- a/addons/project_timesheet/i18n/fr_FR.po
+++ b/addons/project_timesheet/i18n/fr_FR.po
@@ -4,14 +4,14 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:42+0000"
-"PO-Revision-Date: 2008-09-11 15:41:42+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-11 15:41:42+0000\n"
+"PO-Revision-Date: 2008-09-11 15:41:42+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
diff --git a/addons/purchase/i18n/fr_FR.po b/addons/purchase/i18n/fr_FR.po
index faa8b4ce4a7..ac50f2b0c75 100644
--- a/addons/purchase/i18n/fr_FR.po
+++ b/addons/purchase/i18n/fr_FR.po
@@ -4,47 +4,44 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 13:26+0000\n"
+"PO-Revision-Date: 2008-10-14 14:21+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-14 15:00+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
#: field:purchase.order,invoiced:0
msgid "Invoiced & Paid"
msgstr "Facturé & payé"
-#. module: purchase
-#: field:purchase.order,location_id:0
-msgid "Destination"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Validated By"
-msgstr ""
-
#. module: purchase
#: field:purchase.order,partner_id:0
msgid "Supplier"
-msgstr ""
+msgstr "Fournisseur"
#. module: purchase
#: wizard_view:purchase.order.merge,init:0
-msgid "Please note that orders will only be merged if they are to the same partner and going to the same location, and lines will only be merged if they are exactly the same except for the quantity and unit."
-msgstr "Veuillez noter que les commandes ne seront fusionnées que si elles sont destinées au même partenaire et vont à la même zone de stockage, et que les lignes ne seront fusionnées que si elles sont exactement les mêmes, sauf pour la quantité et l'unité"
+msgid ""
+"Please note that orders will only be merged if they are to the same partner "
+"and going to the same location, and lines will only be merged if they are "
+"exactly the same except for the quantity and unit."
+msgstr ""
+"Veuillez noter que les commandes ne seront fusionnées que si elles sont "
+"destinées au même partenaire et vont à la même zone de stockage, et que les "
+"lignes ne seront fusionnées que si elles sont exactement les mêmes, sauf "
+"pour la quantité et l'unité"
#. module: purchase
-#, python-format
-#: code:addons/purchase/purchase.py:0
-msgid "No Pricelist !"
-msgstr ""
+#: rml:purchase.order:0
+msgid "Your order reference :"
+msgstr "Votre référence de commande :"
#. module: purchase
#: model:ir.model,name:purchase.model_purchase_order
@@ -54,32 +51,37 @@ msgstr "Commande fournisseur"
#. module: purchase
#: model:product.pricelist,name:purchase.list0
msgid "Default Purchase Pricelist"
-msgstr ""
+msgstr "Liste de prix d'achat par défaut"
#. module: purchase
#: rml:purchase.quotation:0
msgid "Thanks,"
msgstr "Merci,"
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr "Fusionner les achats"
-
#. module: purchase
#: help:res.partner,property_product_pricelist_purchase:0
-msgid "This pricelist will be used, instead of the default one, for purchases from the current partner"
-msgstr "Cette liste de prix sera utilisée, au lieu de celle par défaut, pour les achats du partenaire courant"
+msgid ""
+"This pricelist will be used, instead of the default one, for purchases from "
+"the current partner"
+msgstr ""
+"Cette liste de prix sera utilisée, au lieu de celle par défaut, pour les "
+"achats du partenaire courant"
#. module: purchase
#: rml:purchase.order:0
+#: rml:purchase.quotation:0
msgid "Fax :"
msgstr "Fax :"
#. module: purchase
#: help:purchase.order,pricelist_id:0
-msgid "The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."
+msgid ""
+"The pricelist sets the currency used for this purchase order. It also "
+"computes the supplier price for the selected products/quantities."
msgstr ""
+"La liste de prix fixe la devise utilisée pour la commande d'achat. Elle "
+"calcule également le prix fournisseur pour les quantités de produits "
+"sélectionnées."
#. module: purchase
#: field:purchase.order.line,price_subtotal:0
@@ -98,20 +100,11 @@ msgid "Purchase Orders in Progress"
msgstr "Ordres d'achat en cours"
#. module: purchase
-#: field:purchase.order.line,notes:0
-#: field:purchase.order,notes:0
-#: view:purchase.order:0
-#: view:purchase.order.line:0
-msgid "Notes"
-msgstr "Notes"
+#: field:purchase.order,minimum_planned_date:0
+msgid "Minimum Planned Date"
+msgstr "Date Plannifiée Minimum"
#. module: purchase
-#: rml:purchase.order:0
-msgid "N°"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
#: field:purchase.order,amount_tax:0
#: field:purchase.order.line,taxes_id:0
msgid "Taxes"
@@ -123,12 +116,7 @@ msgstr "Taxes"
#: view:purchase.order:0
#: model:res.request.link,name:purchase.req_link_purchase_order
msgid "Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Total :"
-msgstr ""
+msgstr "Commande d'achat"
#. module: purchase
#: selection:purchase.order,state:0
@@ -137,29 +125,33 @@ msgstr "Annulé"
#. module: purchase
#: help:purchase.order,state:0
-msgid "The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception."
+msgid ""
+"The state of the purchase order or the quotation request. A quotation is a "
+"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
+"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
+"order to change the state to 'Approved'. When the purchase order is paid and "
+"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
+"or in the reception of goods, the state becomes in exception."
msgstr ""
+"État de la commande d'achat ou du devis. Un devis est une commande d'achat à "
+"l'état 'Brouillon'. La commande doit alors être confirmée par l'utilisateur, "
+"l'état deviendra 'Confirmée'. Le fournisseur devra alors confirmer la "
+"commande pour changer l'état à 'Appouvée'. Lorsque la commande d'achat est "
+"payée et reçue, l'état devient 'Terminé'. Si une action 'Annuler' est "
+"déclenchée dans la facturation ou dans la réception de marchandises, l'état "
+"de la commande se met en exception."
#. module: purchase
#: field:purchase.order,origin:0
msgid "Origin"
msgstr "Origine"
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr ""
-
#. module: purchase
#: rml:purchase.order:0
+#: rml:purchase.quotation:0
msgid "TVA :"
msgstr "TVA :"
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr ""
-
#. module: purchase
#: view:purchase.order:0
msgid "Invoice Done"
@@ -173,7 +165,7 @@ msgstr "Compte analytique"
#. module: purchase
#: model:ir.model,name:purchase.model_purchase_order_line
msgid "Purchase Order lines"
-msgstr ""
+msgstr "Lignes de commande d'achat"
#. module: purchase
#: field:purchase.order,validator:0
@@ -190,18 +182,6 @@ msgstr "Prix net"
msgid "Order Line"
msgstr "Ligne de commande"
-#. module: purchase
-#, python-format
-#: code:addons/purchase/purchase.py:0
-msgid "You have to select a pricelist in the purchase form !\nPlease set one before choosing a product."
-msgstr ""
-
-#. module: purchase
-#, python-format
-#: code:addons/purchase/purchase.py:0
-msgid "Wrong Product UOM !"
-msgstr ""
-
#. module: purchase
#: selection:purchase.order,state:0
msgid "Confirmed"
@@ -210,7 +190,7 @@ msgstr "Visé par acheteur"
#. module: purchase
#: view:purchase.order:0
msgid "Invoice Control"
-msgstr ""
+msgstr "Contrôle facture"
#. module: purchase
#: rml:purchase.quotation:0
@@ -235,12 +215,7 @@ msgstr "Entrepôt"
#. module: purchase
#: field:purchase.order,order_line:0
msgid "Order Lines"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr ""
+msgstr "Lignes de la commande"
#. module: purchase
#: view:purchase.order:0
@@ -253,14 +228,9 @@ msgid "Shipping address :"
msgstr "Adresse de livraison :"
#. module: purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr "Liste de prix d'achat"
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr ""
+#: rml:purchase.quotation:0
+msgid "Printed:"
+msgstr "Imprimé:"
#. module: purchase
#: view:purchase.order:0
@@ -268,9 +238,9 @@ msgid "Approved by Supplier"
msgstr "Approuvé par le fournisseur"
#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr ""
+#: model:ir.actions.wizard,name:purchase.purchase_order_merge
+msgid "Merge purchases"
+msgstr "Fusionner les achats"
#. module: purchase
#: field:purchase.order.line,move_dest_id:0
@@ -280,7 +250,7 @@ msgstr "Destination de la réservation"
#. module: purchase
#: field:purchase.order,name:0
msgid "Order Reference"
-msgstr ""
+msgstr "Référence commande"
#. module: purchase
#: field:purchase.order,pricelist_id:0
@@ -290,7 +260,17 @@ msgstr "Liste de prix"
#. module: purchase
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue!"
+
+#. module: purchase
+#: rml:purchase.order:0
+msgid "Date ordered :"
+msgstr "Date de commande :"
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid "Minimum schedule date of all products."
+msgstr "Date prévue minimum pour tous les produits"
#. module: purchase
#: selection:purchase.order,invoice_method:0
@@ -298,25 +278,25 @@ msgid "Manual"
msgstr "Manuel"
#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for quotation :"
-msgstr ""
+#: rml:purchase.order:0
+msgid "Our order reference :"
+msgstr "Notre référence de commande :"
#. module: purchase
-#: selection:purchase.order,state:0
-msgid "Shipping Exception"
-msgstr "Exception livraison"
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid "This is computed as the minimum scheduled date of all purchase order lines' products."
-msgstr ""
+#: rml:purchase.order:0
+msgid "N° :"
+msgstr "N° :"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
msgid "Purchase orders"
msgstr "Ordres d'achat"
+#. module: purchase
+#: rml:purchase.order:0
+msgid "TOTAL :"
+msgstr "TOTAL :"
+
#. module: purchase
#: selection:purchase.order,invoice_method:0
msgid "From picking"
@@ -326,7 +306,12 @@ msgstr "Sur colisages"
#: model:ir.actions.act_window,name:purchase.purchase_form_action3
#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
msgid "Purchase Order Waiting Approval"
-msgstr ""
+msgstr "Commande d'achat en attente d'approbation"
+
+#. module: purchase
+#: rml:purchase.quotation:0
+msgid "Tel. :"
+msgstr "Tél. :"
#. module: purchase
#: view:purchase.order:0
@@ -335,35 +320,36 @@ msgstr "Confirmer cde fourn."
#. module: purchase
#: help:purchase.order,picking_ids:0
-msgid "This is the list of picking list that have been generated for this purchase"
-msgstr "Ceci est la liste de la liste de picking ayant été généré pour cet achat"
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr ""
+"Ceci est la liste de la liste de picking ayant été généré pour cet achat"
#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Partner Ref."
msgstr "Réf. Partenaire"
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr ""
-
#. module: purchase
#: field:purchase.order,invoiced_rate:0
msgid "Invoiced"
-msgstr ""
-
-#. module: purchase
-#, python-format
-#: code:addons/purchase/purchase.py:0
-msgid "You have to select a product UOM in the same category than the purchase UOM of the product"
-msgstr ""
+msgstr "Facturée"
#. module: purchase
#: field:purchase.order,dest_address_id:0
msgid "Destination Address"
msgstr "Adresse de destination"
+#. module: purchase
+#: rml:purchase.order:0
+msgid "Applicable Taxes"
+msgstr "Taxes Applicables"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+msgid "Shipping Exception"
+msgstr "Exception livraison"
+
#. module: purchase
#: field:stock.move,purchase_line_id:0
#: view:purchase.order.line:0
@@ -373,22 +359,27 @@ msgstr "Ligne de commande"
#. module: purchase
#: view:purchase.order:0
msgid "Calendar View"
-msgstr ""
+msgstr "Vue calendrier"
#. module: purchase
#: selection:purchase.order,state:0
msgid "Invoice Exception"
msgstr "Exception facture"
+#. module: purchase
+#: rml:purchase.order:0
+msgid "Taxes :"
+msgstr "Taxes :"
+
#. module: purchase
#: view:res.partner:0
msgid "Sales & Purchases"
-msgstr ""
+msgstr "Ventes & Achats"
#. module: purchase
#: view:purchase.order:0
msgid "Delivery & Invoices"
-msgstr ""
+msgstr "Livraisons & Factures"
#. module: purchase
#: rml:purchase.quotation:0
@@ -396,26 +387,15 @@ msgid "Date"
msgstr "Date"
#. module: purchase
-#, python-format
-#: code:addons/purchase/purchase.py:0
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+#: field:purchase.order,location_id:0
+msgid "Delivery destination"
+msgstr "Destination de Livraison"
#. module: purchase
#: field:purchase.order.line,date_planned:0
msgid "Scheduled date"
msgstr "Date prévue"
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr ""
-
#. module: purchase
#: view:purchase.order:0
msgid "Compute"
@@ -426,6 +406,11 @@ msgstr "Calculer"
msgid "Cancel Purchase Order"
msgstr "Annuler cde fourn."
+#. module: purchase
+#: rml:purchase.order:0
+msgid "Validated by :"
+msgstr "Valider par :"
+
#. module: purchase
#: field:purchase.order.line,product_qty:0
msgid "Quantity"
@@ -434,12 +419,12 @@ msgstr "Quantité"
#. module: purchase
#: view:res.partner:0
msgid "Purchases"
-msgstr ""
+msgstr "Achats"
#. module: purchase
#: field:purchase.order,state:0
msgid "Order Status"
-msgstr ""
+msgstr "État de la commande"
#. module: purchase
#: view:purchase.order:0
@@ -452,12 +437,6 @@ msgstr "Approuver cde achat"
msgid "Qty"
msgstr "Qté"
-#. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Prix"
-
#. module: purchase
#: selection:purchase.order,state:0
msgid "Done"
@@ -482,7 +461,12 @@ msgstr "Réf. Commande"
#: model:ir.actions.act_window,name:purchase.purchase_form_action
#: model:ir.ui.menu,name:purchase.menu_purchase_form_action
msgid "Purchase Orders"
-msgstr ""
+msgstr "Commandes d'achats"
+
+#. module: purchase
+#: rml:purchase.quotation:0
+msgid "Other reference :"
+msgstr "Autre référence :"
#. module: purchase
#: wizard_view:purchase.order.merge,init:0
@@ -492,14 +476,17 @@ msgstr "Fusionner les commandes"
#. module: purchase
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
msgid "New Purchase Order"
-msgstr ""
+msgstr "Nouvelles commandes d'achats"
#. module: purchase
#: field:purchase.order,shipped:0
@@ -509,6 +496,7 @@ msgstr "Reçu"
#. module: purchase
#: rml:purchase.order:0
+#: rml:purchase.quotation:0
#: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
#: selection:purchase.order,state:0
msgid "Request for Quotation"
@@ -526,8 +514,9 @@ msgstr "Sur la commande"
#. module: purchase
#: rml:purchase.order:0
-msgid "Date Req."
-msgstr ""
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Prix"
#. module: purchase
#: field:purchase.order,date_approve:0
@@ -535,21 +524,35 @@ msgid "Date Approved"
msgstr "Date approbation"
#. module: purchase
+#: rml:purchase.quotation:0
#: field:purchase.order.line,product_id:0
msgid "Product"
msgstr "Produit"
#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
#: field:purchase.order.line,name:0
msgid "Description"
msgstr "Description"
+#. module: purchase
+#: rml:purchase.order:0
+msgid "Product Description"
+msgstr "Descriptif Produit"
+
+#. module: purchase
+#: rml:purchase.order:0
+msgid "Date Requested"
+msgstr "Date de Demande"
+
+#. module: purchase
+#: rml:purchase.quotation:0
+msgid "-"
+msgstr "-"
+
#. module: purchase
#: view:purchase.order:0
msgid "Delivery"
-msgstr ""
+msgstr "Livraison"
#. module: purchase
#: field:purchase.order.line,product_uom:0
@@ -567,9 +570,12 @@ msgid "Reservation"
msgstr "Réservation"
#. module: purchase
-#: rml:purchase.order:0
-msgid "Your Order Reference"
-msgstr ""
+#: field:purchase.order.line,notes:0
+#: field:purchase.order,notes:0
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Notes"
+msgstr "Notes"
#. module: purchase
#: view:purchase.order:0
@@ -582,27 +588,30 @@ msgid "Total amount"
msgstr "Montant total"
#. module: purchase
-#: rml:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
-msgstr "Date de commande"
+msgstr "Date de Commande"
+
+#. module: purchase
+#: rml:purchase.order:0
+msgid "Net Total :"
+msgstr "Net à payer :"
#. module: purchase
#: view:purchase.order:0
msgid "Purchase Control"
-msgstr ""
+msgstr "Contrôle d'achat"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_form_action2
#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
msgid "Request For Quotations"
-msgstr ""
+msgstr "Demande de Devis"
#. module: purchase
-#, python-format
-#: code:addons/purchase/purchase.py:0
-msgid "Error !"
-msgstr ""
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
+msgstr "Liste de prix d'achat"
#. module: purchase
#: field:purchase.order,invoice_method:0
@@ -628,6 +637,7 @@ msgstr "Total"
#: constraint:product.pricelist.version:0
msgid "You can not have 2 pricelist version that overlaps!"
msgstr ""
+"Vous en pouvez pas avoir 2 listes de prix avec des dates qui se chevauchent"
#. module: purchase
#: wizard_view:purchase.order.merge,init:0
@@ -638,4 +648,3 @@ msgstr "Êtes-vous sûr de vouloir fusionner ces commandes ?"
#: field:purchase.order,amount_untaxed:0
msgid "Untaxed Amount"
msgstr "Montant HT"
-
diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml
index d100c4a772c..23891fda515 100644
--- a/addons/purchase/process/purchase_process.xml
+++ b/addons/purchase/process/purchase_process.xml
@@ -23,6 +23,7 @@
+
@@ -67,6 +68,7 @@
+
@@ -89,6 +91,7 @@
+
@@ -96,7 +99,19 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -104,8 +119,9 @@
+
-
+
@@ -122,6 +138,7 @@
+
@@ -150,6 +167,45 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ .
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 7bbc1092229..f4cd733ecf0 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -238,11 +238,11 @@ class purchase_order(osv.osv):
if not part:
return {'value':{'partner_address_id': False}}
addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['default'])
- pricelist = self.pool.get('res.partner').property_get(cr, uid,
- part,property_pref=['property_product_pricelist_purchase']).get('property_product_pricelist_purchase',False)
+ part = self.pool.get('res.partner').browse(cr, uid, part)
+ pricelist = part.property_product_pricelist_purchase.id
return {'value':{'partner_address_id': addr['default'], 'pricelist_id': pricelist}}
- def wkf_approve_order(self, cr, uid, ids):
+ def wkf_approve_order(self, cr, uid, ids, context={}):
self.write(cr, uid, ids, {'state': 'approved', 'date_approve': time.strftime('%Y-%m-%d')})
return True
@@ -275,15 +275,15 @@ class purchase_order(osv.osv):
})
def inv_line_create(self,a,ol):
return (0, False, {
- 'name': ol.name,
- 'account_id': a,
- 'price_unit': ol.price_unit or 0.0,
- 'quantity': ol.product_qty,
- 'product_id': ol.product_id.id or False,
- 'uos_id': ol.product_uom.id or False,
- 'invoice_line_tax_id': [(6, 0, [x.id for x in ol.taxes_id])],
- 'account_analytic_id': ol.account_analytic_id.id,
- })
+ 'name': ol.name,
+ 'account_id': a,
+ 'price_unit': ol.price_unit or 0.0,
+ 'quantity': ol.product_qty,
+ 'product_id': ol.product_id.id or False,
+ 'uos_id': ol.product_uom.id or False,
+ 'invoice_line_tax_id': [(6, 0, [x.id for x in ol.taxes_id])],
+ 'account_analytic_id': ol.account_analytic_id.id,
+ })
def action_invoice_create(self, cr, uid, ids, *args):
res = False
@@ -299,17 +299,8 @@ class purchase_order(osv.osv):
raise osv.except_osv(_('Error !'), _('There is no expense account defined for this product: "%s" (id:%d)') % (ol.product_id.name, ol.product_id.id,))
else:
a = self.pool.get('ir.property').get(cr, uid, 'property_account_expense_categ', 'product.category')
+ a = self.pool.get('account.fiscal.position').map_account(cr, uid, o.partner_id, a)
il.append(self.inv_line_create(a,ol))
-# il.append((0, False, {
-# 'name': ol.name,
-# 'account_id': a,
-# 'price_unit': ol.price_unit or 0.0,
-# 'quantity': ol.product_qty,
-# 'product_id': ol.product_id.id or False,
-# 'uos_id': ol.product_uom.id or False,
-# 'invoice_line_tax_id': [(6, 0, [x.id for x in ol.taxes_id])],
-# 'account_analytic_id': ol.account_analytic_id.id,
-# }))
a = o.partner_id.property_account_payable.id
inv = {
@@ -457,21 +448,9 @@ class purchase_order_line(osv.osv):
res = {'value': {'price_unit': price, 'name':prod_name, 'taxes_id':prod['supplier_taxes_id'], 'date_planned': dt,'notes':prod['description_purchase'], 'product_uom': uom}}
domain = {}
-
+ partner = self.pool.get('res.partner').browse(cr, uid, partner_id)
taxes = self.pool.get('account.tax').browse(cr, uid,prod['supplier_taxes_id'])
- taxep = None
- if partner_id:
- taxep_id = self.pool.get('res.partner').property_get(cr, uid,partner_id,property_pref=['property_account_supplier_tax']).get('property_account_supplier_tax',False)
- if taxep_id:
- taxep=self.pool.get('account.tax').browse(cr, uid,taxep_id)
- if not taxep or not taxep.id:
- res['value']['taxes_id'] = [x.id for x in prod['supplier_taxes_id']]
- else:
- res5 = [taxep.id]
- for t in taxes:
- if not t.tax_group==taxep.tax_group:
- res5.append(t.id)
- res['value']['taxes_id'] = res5
+ res['value']['taxes_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, partner, taxes)
res2 = self.pool.get('product.uom').read(cr, uid, [uom], ['category_id'])
res3 = self.pool.get('product.uom').read(cr, uid, [prod_uom_po], ['category_id'])
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 48a24bee967..bd447d01f68 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -50,7 +50,7 @@
-
+
@@ -195,7 +195,6 @@
-
diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
old mode 100644
new mode 100755
index 86fb8008807..d8959d3663d
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -101,9 +101,9 @@
-
-
-
+
+
+
@@ -140,7 +140,7 @@
[[ repeatIn(objects,'o') ]]
-
+
@@ -149,52 +149,52 @@
|
-
+
|
|
- [[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]
- Shipping address :
- [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]
- [[ addr.title or '' ]] [[ addr.name ]]
- [[ addr.street ]]
- [[ addr.street2 or '' ]]
- [[ addr.zip or '' ]] [[ addr.city or '' ]]
- [[ addr.state_id and addr.state_id.name or '' ]]
- [[ addr.country_id and addr.country_id.name or '' ]]
+ [[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]
+ Shipping address :
+ [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]
+ [[ addr.title or '' ]] [[ addr.name ]]
+ [[ addr.street ]]
+ [[ addr.street2 or '' ]]
+ [[ addr.zip or '' ]] [[ addr.city or '' ]]
+ [[ addr.state_id and addr.state_id.name or '' ]]
+ [[ addr.country_id and addr.country_id.name or '' ]]
|
-
+
|
-
+
|
- [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]
- [[ o.partner_address_id.title or '' ]] [[ o.partner_address_id.name ]]
- [[ o.partner_address_id.street ]]
- [[ o.partner_address_id.street2 or '' ]]
- [[ o.partner_address_id.zip or '' ]] [[ o.partner_address_id.city or '' ]]
- [[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or '' ]]
- [[ o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]]
-
+ [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]
+ [[ o.partner_address_id.title or '' ]] [[ o.partner_address_id.name ]]
+ [[ o.partner_address_id.street ]]
+ [[ o.partner_address_id.street2 or '' ]]
+ [[ o.partner_address_id.zip or '' ]] [[ o.partner_address_id.city or '' ]]
+ [[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or '' ]]
+ [[ o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]]
+
- Tel. : [[ o.partner_address_id.phone or '' ]]
- Fax : [[ o.partner_address_id.fax or '' ]]
- TVA : [[ o.partner_id.vat or '' ]]
+ Tél. : [[ o.partner_address_id.phone or '' ]]
+ Fax : [[ o.partner_address_id.fax or '' ]]
+ TVA : [[ o.partner_id.vat or '' ]]
|
-
+
@@ -203,10 +203,7 @@
- [[ (o.state=='draft' or removeParentNode('font')) and 'Request for Quotation' ]] [[ (o.state<>'draft' or removeParentNode('font')) and 'Purchase Order Confirmation' ]] N° [[ o.name ]]
-
-
-
+ [[ (o.state=='draft' or removeParentNode('font')) and 'Request for Quotation' ]] [[ (o.state<>'draft' or removeParentNode('font')) and 'Purchase Order Confirmation' ]] N° [[ o.name ]]
@@ -229,23 +226,23 @@
|
- [[ o.name or '' ]]
+ [[ o.name or '' ]]
|
- [[ o.partner_ref or '' ]]
+ [[ o.partner_ref or '' ]]
|
- [[ time.strftime('%d/%m/%Y', time.strptime(line.date_planned, '%Y-%m-%d %H:%M:%S')) ]]
+ [[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]]
|
- [[ o.validator and o.validator.name or '' ]]
+ [[ o.validator and o.validator.name or '' ]]
|
-
+
Description
@@ -269,7 +266,7 @@
[[ repeatIn(o.order_line,'line') ]]
-
+
|
[[ line.name ]]
@@ -278,7 +275,7 @@
[[ ', '.join(map(lambda x: x.name, line.taxes_id)) ]]
|
- [[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d')) ]]
+ [[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d %H:%M:%S')) ]]
|
[[ line.product_qty ]]
@@ -330,7 +327,7 @@
|
-
+
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 15b888f360e..68be681fdf5 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -1,3 +1,9 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_purchase_order,purchase.order,model_purchase_order,purchase.group_purchase_user,1,1,1,1
-access_purchase_order_line,purchase.order.line,model_purchase_order_line,purchase.group_purchase_user,1,1,1,1
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_purchase_order","purchase.order","model_purchase_order","purchase.group_purchase_user",1,1,1,1
+"access_purchase_order_line","purchase.order.line","model_purchase_order_line","purchase.group_purchase_user",1,1,1,1
+"access_stock_location_purchase_user","stock.location purchase_user","stock.model_stock_location","purchase.group_purchase_user",1,0,0,0
+"access_stock_warehouse_purchase_user","stock.warehouse purchase_user","stock.model_stock_warehouse","purchase.group_purchase_user",1,0,0,0
+"access_stock_picking_purchase_user","stock.picking purchase_user","stock.model_stock_picking","purchase.group_purchase_user",1,1,1,1
+"access_stock_move_purchase_user","stock.move purchase_user","stock.model_stock_move","purchase.group_purchase_user",1,1,1,1
+"access_purchase_order_stock_worker","purchase.order stock_worker","model_purchase_order","stock.group_stock_user",1,0,0,0
+"access_purchase_order_line_stock_worker","purchase.order.line stock_worker","model_purchase_order_line","stock.group_stock_user",1,0,0,0
diff --git a/addons/purchase_analytic_plans/i18n/fr_FR.po b/addons/purchase_analytic_plans/i18n/fr_FR.po
index 0939ee6233c..dc322fd9e68 100644
--- a/addons/purchase_analytic_plans/i18n/fr_FR.po
+++ b/addons/purchase_analytic_plans/i18n/fr_FR.po
@@ -4,19 +4,19 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 13:23+0000\n"
+"PO-Revision-Date: 2008-10-13 16:35+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-13 16:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase_analytic_plans
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
-
+msgstr "XML non valide pour l'architecture de la vue"
diff --git a/addons/report_account/i18n/fr_FR.po b/addons/report_account/i18n/fr_FR.po
index 6701710ca06..099515aedfa 100644
--- a/addons/report_account/i18n/fr_FR.po
+++ b/addons/report_account/i18n/fr_FR.po
@@ -4,16 +4,16 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-11 15:41:43+0000\n"
+"PO-Revision-Date: 2008-09-11 15:41:43+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
#. module: report_account
#: constraint:ir.ui.view:0
diff --git a/addons/report_analytic/i18n/fr_FR.po b/addons/report_analytic/i18n/fr_FR.po
index 4620c36384f..80561646c20 100644
--- a/addons/report_analytic/i18n/fr_FR.po
+++ b/addons/report_analytic/i18n/fr_FR.po
@@ -4,16 +4,17 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 13:28+0000\n"
+"PO-Revision-Date: 2008-10-13 16:54+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-13 17:32+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: report_analytic
#: model:ir.model,name:report_analytic.model_report_analytic_account_close
@@ -22,8 +23,11 @@ msgstr "Comptes analytiques à clôturer"
#. module: report_analytic
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: report_analytic
#: field:report.analytic.account.close,quantity_max:0
@@ -33,7 +37,7 @@ msgstr "Quantité Max."
#. module: report_analytic
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue"
#. module: report_analytic
#: field:report.analytic.account.close,name:0
@@ -64,10 +68,9 @@ msgstr "Balance"
#: model:ir.ui.menu,name:report_analytic.menu_action_analytic_account_tree
#: view:report.analytic.account.close:0
msgid "Expired analytic accounts"
-msgstr ""
+msgstr "Comptes Analytiques Expirés"
#. module: report_analytic
#: field:report.analytic.account.close,quantity:0
msgid "Quantity"
msgstr "Quantité"
-
diff --git a/addons/report_analytic_line/i18n/fr_FR.po b/addons/report_analytic_line/i18n/fr_FR.po
index e152eef50a3..2648464e39d 100644
--- a/addons/report_analytic_line/i18n/fr_FR.po
+++ b/addons/report_analytic_line/i18n/fr_FR.po
@@ -4,16 +4,17 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 13:34+0000\n"
+"PO-Revision-Date: 2008-10-13 16:52+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-13 17:28+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: report_analytic_line
#: field:report.account.analytic.line.to.invoice,product_id:0
@@ -22,8 +23,11 @@ msgstr "Produit"
#. module: report_analytic_line
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: report_analytic_line
#: model:ir.actions.act_window,name:report_analytic_line.action_account_analytic_line_to_invoice
@@ -41,7 +45,7 @@ msgstr "Prix de vente"
#. module: report_analytic_line
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue"
#. module: report_analytic_line
#: field:report.account.analytic.line.to.invoice,name:0
@@ -72,4 +76,3 @@ msgstr "Unités"
#: field:report.account.analytic.line.to.invoice,product_uom_id:0
msgid "UoM"
msgstr "UdM"
-
diff --git a/addons/report_analytic_planning/i18n/fr_FR.po b/addons/report_analytic_planning/i18n/fr_FR.po
index 8ebcdf621cc..3b2b9131f62 100644
--- a/addons/report_analytic_planning/i18n/fr_FR.po
+++ b/addons/report_analytic_planning/i18n/fr_FR.po
@@ -4,16 +4,17 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 13:26+0000\n"
+"PO-Revision-Date: 2008-10-13 16:52+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-13 17:24+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: report_analytic_planning
#: rml:report_account_analytic.planning.print:0
@@ -22,8 +23,11 @@ msgstr "A:"
#. module: report_analytic_planning
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: report_analytic_planning
#: field:report_account_analytic.planning,stat_ids:0
@@ -43,7 +47,7 @@ msgstr "responsible"
#. module: report_analytic_planning
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue"
#. module: report_analytic_planning
#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
@@ -53,7 +57,7 @@ msgstr "Planning statistiques"
#. module: report_analytic_planning
#: field:report_account_analytic.planning,state:0
msgid "Status"
-msgstr ""
+msgstr "État"
#. module: report_analytic_planning
#: field:report_account_analytic.planning.line,account_id:0
@@ -64,12 +68,12 @@ msgstr "Compte analytique"
#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
msgid "My Current Plannings"
-msgstr ""
+msgstr "Mon Planning Courant"
#. module: report_analytic_planning
#: view:report_account_analytic.planning:0
msgid "Planning by Account"
-msgstr ""
+msgstr "Planning par Compte"
#. module: report_analytic_planning
#: rml:report_account_analytic.planning.print:0
@@ -96,13 +100,13 @@ msgstr "Réel"
#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
msgid "Planning Statistics of My Projects"
-msgstr ""
+msgstr "Statistiques des Plannings de mes Projets"
#. module: report_analytic_planning
#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
msgid "Planning Statistics"
-msgstr ""
+msgstr "Statistiques des Plannings"
#. module: report_analytic_planning
#: field:report_account_analytic.planning,name:0
@@ -129,12 +133,12 @@ msgstr "Planning RH"
#: field:report_account_analytic.planning.stat,sum_amount_real:0
#: field:report_account_analytic.planning.stat.user,sum_amount_real:0
msgid "Timesheet"
-msgstr ""
+msgstr "Feuille de présence"
#. module: report_analytic_planning
#: view:report_account_analytic.planning:0
msgid "Time by Account"
-msgstr ""
+msgstr "Temps par COmpte"
#. module: report_analytic_planning
#: rml:report_account_analytic.planning.print:0
@@ -163,12 +167,12 @@ msgstr "De:"
#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
msgid "My Plannings"
-msgstr ""
+msgstr "Mes Plannings"
#. module: report_analytic_planning
#: field:report_account_analytic.planning,date_to:0
msgid "End Date"
-msgstr ""
+msgstr "Date de fin"
#. module: report_analytic_planning
#: field:report_account_analytic.planning.stat,account_id:0
@@ -178,17 +182,17 @@ msgstr "Compte"
#. module: report_analytic_planning
#: view:report_account_analytic.planning:0
msgid "Time by User"
-msgstr ""
+msgstr "Temps par Utilisateur"
#. module: report_analytic_planning
#: view:report_account_analytic.planning:0
msgid "Quantities by Account"
-msgstr ""
+msgstr "Quantités par Compte"
#. module: report_analytic_planning
#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
msgid "Plannings"
-msgstr ""
+msgstr "Plannings"
#. module: report_analytic_planning
#: view:report_account_analytic.planning:0
@@ -203,7 +207,7 @@ msgstr "Projet"
#. module: report_analytic_planning
#: view:report_account_analytic.planning:0
msgid "Total Timesheet"
-msgstr ""
+msgstr "Total des feuilles de présence"
#. module: report_analytic_planning
#: rml:report_account_analytic.planning.print:0
@@ -235,12 +239,12 @@ msgstr "Planning par compte"
#. module: report_analytic_planning
#: rml:report_account_analytic.planning.print:0
msgid "["
-msgstr ""
+msgstr "["
#. module: report_analytic_planning
#: rml:report_account_analytic.planning.print:0
msgid "]"
-msgstr ""
+msgstr "]"
#. module: report_analytic_planning
#: field:report_account_analytic.planning.line,amount:0
@@ -272,18 +276,18 @@ msgstr "Compte analytique"
#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
msgid "Current Plannings"
-msgstr ""
+msgstr "Plannings Courants"
#. module: report_analytic_planning
#: view:report_account_analytic.planning:0
msgid "Quantities by User"
-msgstr ""
+msgstr "Quantités par Utilisateur"
#. module: report_analytic_planning
#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
msgid "My Planning Statistics"
-msgstr ""
+msgstr "Mes Statistiques de Planning"
#. module: report_analytic_planning
#: field:report_account_analytic.planning.stat,manager_id:0
@@ -306,17 +310,17 @@ msgstr "Planning"
#. module: report_analytic_planning
#: selection:report_account_analytic.planning,state:0
msgid "Done"
-msgstr ""
+msgstr "Terminé"
#. module: report_analytic_planning
#: view:report_account_analytic.planning:0
msgid "Total Planned"
-msgstr ""
+msgstr "Total Plannifié"
#. module: report_analytic_planning
#: field:report_account_analytic.planning,date_from:0
msgid "Start Date"
-msgstr ""
+msgstr "Date de début"
#. module: report_analytic_planning
#: view:report_account_analytic.planning.stat:0
@@ -326,11 +330,10 @@ msgstr "Statistiques du planning"
#. module: report_analytic_planning
#: selection:report_account_analytic.planning,state:0
msgid "Open"
-msgstr ""
+msgstr "Ouvert"
#. module: report_analytic_planning
#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
msgid "New Planning"
-msgstr ""
-
+msgstr "Nouveau Planning"
diff --git a/addons/report_analytic_planning/security/ir.model.access.csv b/addons/report_analytic_planning/security/ir.model.access.csv
index 473d252488b..c57a1581547 100644
--- a/addons/report_analytic_planning/security/ir.model.access.csv
+++ b/addons/report_analytic_planning/security/ir.model.access.csv
@@ -1,6 +1,10 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_report_account_analytic_planning,report_account_analytic.planning,model_report_account_analytic_planning,project.group_project_manager,1,1,1,1
-access_report_account_analytic_planning_line,report_account_analytic.planning.line,model_report_account_analytic_planning_line,project.group_project_manager,1,1,1,1
-access_report_account_analytic_planning_stat_account,report_account_analytic.planning.stat.account,model_report_account_analytic_planning_stat_account,project.group_project_user,1,0,0,0
-access_report_account_analytic_planning_stat,report_account_analytic.planning.stat,model_report_account_analytic_planning_stat,project.group_project_user,1,0,0,0
-access_report_account_analytic_planning_stat_user,report_account_analytic.planning.stat.user,model_report_account_analytic_planning_stat_user,project.group_project_user,1,0,0,0
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_report_account_analytic_planning","report_account_analytic.planning","model_report_account_analytic_planning","project.group_project_manager",1,1,1,1
+"access_report_account_analytic_planning_line","report_account_analytic.planning.line","model_report_account_analytic_planning_line","project.group_project_manager",1,1,1,1
+"access_report_account_analytic_planning_stat_account_manager","report_account_analytic.planning.stat.account manager","model_report_account_analytic_planning_stat_account","project.group_project_manager",1,1,1,0
+"access_report_account_analytic_planning_stat_account","report_account_analytic.planning.stat.account","model_report_account_analytic_planning_stat_account","project.group_project_user",1,0,0,0
+"access_report_account_analytic_planning_stat_manager","report_account_analytic.planning.stat manager","model_report_account_analytic_planning_stat","project.group_project_manager",1,1,1,1
+"access_report_account_analytic_planning_stat","report_account_analytic.planning.stat","model_report_account_analytic_planning_stat","project.group_project_user",1,0,0,0
+"access_report_account_analytic_planning_stat_user_manager","report_account_analytic.planning.stat.user manager","model_report_account_analytic_planning_stat_user","project.group_project_manager",1,0,0,0
+"access_report_account_analytic_planning_stat_user","report_account_analytic.planning.stat.user","model_report_account_analytic_planning_stat_user","project.group_project_user",1,0,0,0
+"access_account_analytic_account_project_manager","account.analytic.account project manager","account.model_account_analytic_account","project.group_project_manager",1,1,1,1
diff --git a/addons/report_crm/i18n/fr_FR.po b/addons/report_crm/i18n/fr_FR.po
index 7c90ce249e8..02dc2d1809e 100644
--- a/addons/report_crm/i18n/fr_FR.po
+++ b/addons/report_crm/i18n/fr_FR.po
@@ -4,72 +4,76 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 13:33+0000\n"
+"PO-Revision-Date: 2008-10-11 06:57+0000\n"
+"Last-Translator: Christophe Chauvet \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-14 11:44+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: report_crm
#: field:report.crm.case.categ,categ_id:0
msgid "Category"
-msgstr ""
+msgstr "Catégorie"
#. module: report_crm
#: field:report.crm.case.categ,probability:0
#: field:report.crm.case.user,probability:0
msgid "Avg. Probability"
-msgstr ""
+msgstr "Probabilité Moy."
#. module: report_crm
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: report_crm
#: model:ir.model,name:report_crm.model_report_crm_case_categ
msgid "Cases by section and category"
-msgstr ""
+msgstr "Cas par section et catégorie"
#. module: report_crm
#: field:report.crm.case.categ,section_id:0
#: field:report.crm.case.user,section_id:0
msgid "Section"
-msgstr ""
+msgstr "Section"
#. module: report_crm
#: field:report.crm.case.categ,nbr:0
#: field:report.crm.case.user,nbr:0
msgid "# of Cases"
-msgstr ""
+msgstr "# de cas"
#. module: report_crm
#: field:report.crm.case.categ,delay_close:0
msgid "Delay Close"
-msgstr ""
+msgstr "Delai de fermeture"
#. module: report_crm
#: selection:report.crm.case.categ,state:0
#: selection:report.crm.case.user,state:0
msgid "Draft"
-msgstr ""
+msgstr "Brouillon"
#. module: report_crm
#: selection:report.crm.case.categ,state:0
#: selection:report.crm.case.user,state:0
msgid "Closed"
-msgstr ""
+msgstr "Fermé"
#. module: report_crm
#: model:ir.actions.act_window,name:report_crm.action_report_crm_case_categ_tree_month
#: model:ir.ui.menu,name:report_crm.menu_crm_case_categ_tree_month
msgid "Cases by categories and section (this month)"
-msgstr ""
+msgstr "Cas oar catégories et section (ce mois)"
#. module: report_crm
#: model:ir.ui.menu,name:report_crm.next_id_66
@@ -80,30 +84,30 @@ msgstr "Tous les mois"
#: field:report.crm.case.categ,amount_revenue_prob:0
#: field:report.crm.case.user,amount_revenue_prob:0
msgid "Est. Rev*Prob."
-msgstr ""
+msgstr "Rev*Proba Estim."
#. module: report_crm
#: selection:report.crm.case.categ,state:0
#: selection:report.crm.case.user,state:0
msgid "Pending"
-msgstr ""
+msgstr "En attente"
#. module: report_crm
#: field:report.crm.case.categ,state:0
#: field:report.crm.case.user,state:0
msgid "Status"
-msgstr ""
+msgstr "État"
#. module: report_crm
#: model:ir.actions.act_window,name:report_crm.action_report_crm_case_user_tree_my
#: model:ir.ui.menu,name:report_crm.menu_crm_case_user_tree_my
msgid "My cases by section"
-msgstr ""
+msgstr "Mes cas par section"
#. module: report_crm
#: model:ir.actions.act_window,name:report_crm.act_crm_case_section_2_report_crm_case_user
msgid "Monthly cases by user"
-msgstr ""
+msgstr "Cas Mensuel par utilisateur"
#. module: report_crm
#: model:ir.ui.menu,name:report_crm.next_id_64
@@ -114,17 +118,17 @@ msgstr "Reporting"
#: field:report.crm.case.categ,amount_costs:0
#: field:report.crm.case.user,amount_costs:0
msgid "Est.Cost"
-msgstr ""
+msgstr "Coût Estim."
#. module: report_crm
#: field:report.crm.case.user,user_id:0
msgid "User"
-msgstr ""
+msgstr "Utilisateur"
#. module: report_crm
#: model:ir.actions.act_window,name:report_crm.act_crm_case_section_2_report_crm_case_categ
msgid "Monthly cases by section"
-msgstr ""
+msgstr "Cas mensuel par section"
#. module: report_crm
#: model:ir.actions.act_window,name:report_crm.action_report_crm_case_user_tree
@@ -132,12 +136,12 @@ msgstr ""
#: view:report.crm.case.categ:0
#: view:report.crm.case.user:0
msgid "Cases by User and Section"
-msgstr ""
+msgstr "Cas par Utilisateur et Section"
#. module: report_crm
#: field:report.crm.case.user,delay_close:0
msgid "Delay to close"
-msgstr ""
+msgstr "Delai de fermeture"
#. module: report_crm
#: model:ir.ui.menu,name:report_crm.next_id_65
@@ -147,57 +151,56 @@ msgstr "Ce mois"
#. module: report_crm
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue!"
#. module: report_crm
#: model:ir.actions.act_window,name:report_crm.act_res_users_2_report_crm_case_user
msgid "Monthly cases"
-msgstr ""
+msgstr "Ces mensuels"
#. module: report_crm
#: field:report.crm.case.categ,amount_revenue:0
#: field:report.crm.case.user,amount_revenue:0
msgid "Est.Revenue"
-msgstr ""
+msgstr "Revenu Estim."
#. module: report_crm
#: model:ir.actions.act_window,name:report_crm.action_report_crm_case_user_tree_month
#: model:ir.ui.menu,name:report_crm.menu_crm_case_user_tree_month
msgid "Cases by user and section (this month)"
-msgstr ""
+msgstr "Cas par utilisateur et section (ce mois)"
#. module: report_crm
#: model:ir.actions.act_window,name:report_crm.action_report_crm_case_categ_tree
#: model:ir.ui.menu,name:report_crm.menu_crm_case_categ_tree
msgid "Cases by Categories and Section"
-msgstr ""
+msgstr "Cas par Catégories et Section"
#. module: report_crm
#: field:report.crm.case.categ,name:0
#: field:report.crm.case.user,name:0
msgid "Month"
-msgstr ""
+msgstr "Mois"
#. module: report_crm
#: selection:report.crm.case.categ,state:0
#: selection:report.crm.case.user,state:0
msgid "Canceled"
-msgstr ""
+msgstr "Annulée"
#. module: report_crm
#: model:ir.actions.act_window,name:report_crm.action_report_crm_case_user_tree_month_my
#: model:ir.ui.menu,name:report_crm.menu_crm_case_user_tree_month_my
msgid "My cases by section (this month)"
-msgstr ""
+msgstr "Mes cas par section (ce mois)"
#. module: report_crm
#: model:ir.model,name:report_crm.model_report_crm_case_user
msgid "Cases by user and section"
-msgstr ""
+msgstr "Cas par utilisateur et section"
#. module: report_crm
#: selection:report.crm.case.categ,state:0
#: selection:report.crm.case.user,state:0
msgid "Open"
-msgstr ""
-
+msgstr "Ouvert"
diff --git a/addons/report_document/__terp__.py b/addons/report_document/__terp__.py
index f0e19fe4de9..01baabbb6e1 100644
--- a/addons/report_document/__terp__.py
+++ b/addons/report_document/__terp__.py
@@ -12,7 +12,10 @@
""",
"init_xml" : [],
"demo_xml" : [],
- "update_xml" : ["report_document_view.xml"],
+ "update_xml" : [
+ "report_document_view.xml",
+ "security/ir.model.access.csv",
+ ],
"active": False,
"installable": True
}
diff --git a/addons/report_document/security/ir.model.access.csv b/addons/report_document/security/ir.model.access.csv
new file mode 100644
index 00000000000..8577bf5a5f6
--- /dev/null
+++ b/addons/report_document/security/ir.model.access.csv
@@ -0,0 +1,9 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_report_document_user_group_document_manager","report.document.user document manager","model_report_document_user","document.group_document_manager",1,0,0,0
+"access_report_document_user_group_system","report.document.user group system","model_report_document_user","base.group_system",1,0,0,0
+"access_report_files_partenr_group_document_manager","report.files.partenr document manager","model_report_files_partenr","document.group_document_manager",1,0,0,0
+"access_report_files_partenr_group_system","report.files.partenr group system","model_report_files_partenr","base.group_system",1,0,0,0
+"access_report_document_file_group_document_manager","report.document.file document manager","model_report_document_file","document.group_document_manager",1,0,0,0
+"access_report_document_file_group_system","report.document.file group system","model_report_document_file","base.group_system",1,0,0,0
+"access_report_document_wall_group_document_manager","report.document.wall document manager","model_report_document_wall","document.group_document_manager",1,0,0,0
+"access_report_document_wall_group_system","report.document.wall group system","model_report_document_wall","base.group_system",1,0,0,0
diff --git a/addons/report_intrastat/i18n/fr_FR.po b/addons/report_intrastat/i18n/fr_FR.po
index 1536cce0c9b..d22c81106b0 100644
--- a/addons/report_intrastat/i18n/fr_FR.po
+++ b/addons/report_intrastat/i18n/fr_FR.po
@@ -4,51 +4,52 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 16:28+0000\n"
+"PO-Revision-Date: 2008-10-11 07:01+0000\n"
+"Last-Translator: Christophe Chauvet \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-14 13:32+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: report_intrastat
#: selection:report.intrastat,type:0
msgid "Import"
-msgstr ""
+msgstr "Import"
#. module: report_intrastat
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue!"
#. module: report_intrastat
#: model:ir.model,name:report_intrastat.model_report_intrastat
msgid "Intrastat report"
-msgstr ""
+msgstr "Rapport Intrastat"
#. module: report_intrastat
#: field:report.intrastat.code,description:0
msgid "Description"
-msgstr ""
+msgstr "Description"
#. module: report_intrastat
#: field:report.intrastat,weight:0
msgid "Weight"
-msgstr ""
+msgstr "Poids"
#. module: report_intrastat
#: field:report.intrastat,name:0
msgid "Month"
-msgstr ""
+msgstr "Mois"
#. module: report_intrastat
#: field:res.country,intrastat:0
msgid "Intrastat member"
-msgstr ""
+msgstr "Membre Intrastat"
#. module: report_intrastat
#: model:ir.ui.menu,name:report_intrastat.next_id_89
@@ -58,34 +59,34 @@ msgstr "Ce mois"
#. module: report_intrastat
#: field:report.intrastat,code:0
msgid "Country code"
-msgstr ""
+msgstr "Code pays"
#. module: report_intrastat
#: field:report.intrastat,value:0
msgid "Value"
-msgstr ""
+msgstr "Valeur"
#. module: report_intrastat
#: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_tree
#: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat
msgid "Intrastat (this month)"
-msgstr ""
+msgstr "Intrastat (ce mois)"
#. module: report_intrastat
#: field:report.intrastat,currency_id:0
msgid "Currency"
-msgstr ""
+msgstr "Devise"
#. module: report_intrastat
#: selection:report.intrastat,type:0
msgid "Export"
-msgstr ""
+msgstr "Export"
#. module: report_intrastat
#: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_tree_all
#: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_all
msgid "Intrastat"
-msgstr ""
+msgstr "Intrastat"
#. module: report_intrastat
#: model:ir.ui.menu,name:report_intrastat.next_id_90
@@ -94,24 +95,27 @@ msgstr "Tous les mois"
#. module: report_intrastat
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: report_intrastat
#: field:report.intrastat.code,name:0
#: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_code
msgid "Intrastat Code"
-msgstr ""
+msgstr "Code Intrastat"
#. module: report_intrastat
#: field:report.intrastat,type:0
msgid "Type"
-msgstr ""
+msgstr "Type"
#. module: report_intrastat
#: view:report.intrastat:0
msgid "Intrastat Data"
-msgstr ""
+msgstr "Données Intrastat"
#. module: report_intrastat
#: model:ir.model,name:report_intrastat.model_report_intrastat_code
@@ -119,5 +123,4 @@ msgstr ""
#: field:report.intrastat,intrastat_id:0
#: view:report.intrastat.code:0
msgid "Intrastat code"
-msgstr ""
-
+msgstr "Code Intrastat"
diff --git a/addons/report_intrastat/security/ir.model.access.csv b/addons/report_intrastat/security/ir.model.access.csv
index 7696a6cd9e3..55218658330 100644
--- a/addons/report_intrastat/security/ir.model.access.csv
+++ b/addons/report_intrastat/security/ir.model.access.csv
@@ -1,3 +1,4 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_report_intrastat_code,report.intrastat.code,model_report_intrastat_code,account.group_account_manager,1,1,1,1
-access_report_intrastat,report.intrastat,model_report_intrastat,account.group_account_manager,1,0,0,0
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_report_intrastat_code","report.intrastat.code","model_report_intrastat_code","account.group_account_manager",1,1,1,1
+"access_report_intrastat","report.intrastat","model_report_intrastat","account.group_account_manager",1,0,0,0
+"access_report_intrastat_code_product_manager","report.intrastat.code product manager","model_report_intrastat_code","product.group_product_manager",1,1,1,1
diff --git a/addons/report_mrp/i18n/fr_FR.po b/addons/report_mrp/i18n/fr_FR.po
index 362abb3790d..ba0a0185707 100644
--- a/addons/report_mrp/i18n/fr_FR.po
+++ b/addons/report_mrp/i18n/fr_FR.po
@@ -4,16 +4,17 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 16:30+0000\n"
+"PO-Revision-Date: 2008-10-13 16:40+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-13 17:04+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: report_mrp
#: field:report.mrp.inout,date:0
@@ -34,8 +35,11 @@ msgstr "Variation de la valeur de stock"
#. module: report_mrp
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: report_mrp
#: model:ir.ui.menu,name:report_mrp.next_id_77
@@ -60,7 +64,7 @@ msgstr "Nbre de cycles"
#. module: report_mrp
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue"
#. module: report_mrp
#: field:report.workcenter.load,workcenter_id:0
@@ -81,10 +85,9 @@ msgstr "Charge du centre de travail"
#: model:ir.actions.act_window,name:report_mrp.action_report_workcenter_load_tree
#: model:ir.ui.menu,name:report_mrp.menu_report_workcenter_load
msgid "Workcenter Loads"
-msgstr ""
+msgstr "Charges du Centre de Travail"
#. module: report_mrp
#: view:report.workcenter.load:0
msgid "Workcenters load"
msgstr "Charge des centres de travail"
-
diff --git a/addons/report_project/i18n/fr_FR.po b/addons/report_project/i18n/fr_FR.po
index 8ba4da764a5..a7044273806 100644
--- a/addons/report_project/i18n/fr_FR.po
+++ b/addons/report_project/i18n/fr_FR.po
@@ -4,16 +4,16 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-11 15:41:43+0000\n"
+"PO-Revision-Date: 2008-09-11 15:41:43+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
#. module: report_project
#: model:ir.actions.act_window,name:report_project.action_project_task_user_tree
diff --git a/addons/report_purchase/i18n/fr_FR.po b/addons/report_purchase/i18n/fr_FR.po
index dab4b653856..2ec78c38cde 100644
--- a/addons/report_purchase/i18n/fr_FR.po
+++ b/addons/report_purchase/i18n/fr_FR.po
@@ -4,39 +4,43 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 13:19+0000\n"
+"PO-Revision-Date: 2008-10-11 06:39+0000\n"
+"Last-Translator: Christophe Chauvet \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-14 13:24+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: report_purchase
#: field:report.purchase.order.category,price_average:0
#: field:report.purchase.order.product,price_average:0
msgid "Average Price"
-msgstr ""
+msgstr "Prix moyen"
#. module: report_purchase
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: report_purchase
#: model:ir.actions.act_window,name:report_purchase.action_order_category_tree_all
#: model:ir.ui.menu,name:report_purchase.menu_report_order_category_all
#: view:report.purchase.order.category:0
msgid "Purchases by Category of Products"
-msgstr ""
+msgstr "Commandes d'achats par catégorie de produits"
#. module: report_purchase
#: model:ir.model,name:report_purchase.model_report_purchase_order_product
msgid "Purchases Orders by Products"
-msgstr ""
+msgstr "Commandes d'a"
#. module: report_purchase
#: model:ir.ui.menu,name:report_purchase.next_id_75
@@ -47,35 +51,35 @@ msgstr "Tous les mois"
#: model:ir.actions.act_window,name:report_purchase.action_order_product_tree_all
#: model:ir.ui.menu,name:report_purchase.menu_report_order_product_all
msgid "Purchases by Products"
-msgstr ""
+msgstr "Commandes d'achats par Produits"
#. module: report_purchase
#: field:report.purchase.order.category,state:0
#: field:report.purchase.order.product,state:0
msgid "Order State"
-msgstr ""
+msgstr "État commande"
#. module: report_purchase
#: selection:report.purchase.order.category,state:0
#: selection:report.purchase.order.product,state:0
msgid "Waiting Schedule"
-msgstr ""
+msgstr "Attente d'exécution"
#. module: report_purchase
#: field:report.purchase.order.category,price_total:0
#: field:report.purchase.order.product,price_total:0
msgid "Total Price"
-msgstr ""
+msgstr "Prix Total"
#. module: report_purchase
#: model:ir.model,name:report_purchase.model_report_purchase_order_category
msgid "Purchases Orders by Categories"
-msgstr ""
+msgstr "Commandes d'achats par Catégories"
#. module: report_purchase
#: field:report.purchase.order.product,product_id:0
msgid "Product"
-msgstr ""
+msgstr "Produit"
#. module: report_purchase
#: model:ir.ui.menu,name:report_purchase.next_id_73
@@ -86,30 +90,30 @@ msgstr "Reporting"
#: selection:report.purchase.order.category,state:0
#: selection:report.purchase.order.product,state:0
msgid "Invoice Exception"
-msgstr ""
+msgstr "Exception de facture"
#. module: report_purchase
#: model:ir.actions.act_window,name:report_purchase.action_order_product_tree
#: model:ir.ui.menu,name:report_purchase.menu_report_order_product
msgid "Purchases by Products (this month)"
-msgstr ""
+msgstr "Commandes d'achats par Produit (ce mois)"
#. module: report_purchase
#: field:report.purchase.order.category,quantity:0
#: field:report.purchase.order.product,quantity:0
msgid "# of Products"
-msgstr ""
+msgstr "# de Produits"
#. module: report_purchase
#: view:report.purchase.order.product:0
msgid "Purchases by products"
-msgstr ""
+msgstr "Commandes d'achats par produits"
#. module: report_purchase
#: model:ir.actions.act_window,name:report_purchase.act_product_category_2_report_purchase_order_category
#: model:ir.actions.act_window,name:report_purchase.act_product_product_2_report_purchases_order_product
msgid "Monthly purchases"
-msgstr ""
+msgstr "Commandes d'achats Mensuelle"
#. module: report_purchase
#: model:ir.ui.menu,name:report_purchase.next_id_74
@@ -119,63 +123,62 @@ msgstr "Ce mois"
#. module: report_purchase
#: field:report.purchase.order.category,category_id:0
msgid "Categories"
-msgstr ""
+msgstr "Catégories"
#. module: report_purchase
#: selection:report.purchase.order.category,state:0
#: selection:report.purchase.order.product,state:0
msgid "Quotation"
-msgstr ""
+msgstr "Proposition"
#. module: report_purchase
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue!"
#. module: report_purchase
#: selection:report.purchase.order.category,state:0
#: selection:report.purchase.order.product,state:0
msgid "Manual in progress"
-msgstr ""
+msgstr "Manuel en cours"
#. module: report_purchase
#: model:ir.ui.menu,name:report_purchase.menu_report_order_category
msgid "Purchases by Category of Product (this month)"
-msgstr ""
+msgstr "Commandes d'achats par Catégorie de Produits (ce mois)"
#. module: report_purchase
#: selection:report.purchase.order.category,state:0
#: selection:report.purchase.order.product,state:0
msgid "Shipping Exception"
-msgstr ""
+msgstr "Exception de livraison"
#. module: report_purchase
#: selection:report.purchase.order.category,state:0
#: selection:report.purchase.order.product,state:0
msgid "In progress"
-msgstr ""
+msgstr "En cours"
#. module: report_purchase
#: field:report.purchase.order.category,name:0
#: field:report.purchase.order.product,name:0
msgid "Month"
-msgstr ""
+msgstr "Mois"
#. module: report_purchase
#: field:report.purchase.order.category,count:0
#: field:report.purchase.order.product,count:0
msgid "# of Lines"
-msgstr ""
+msgstr "# de lignes"
#. module: report_purchase
#: selection:report.purchase.order.category,state:0
#: selection:report.purchase.order.product,state:0
msgid "Done"
-msgstr ""
+msgstr "Terminer"
#. module: report_purchase
#: selection:report.purchase.order.category,state:0
#: selection:report.purchase.order.product,state:0
msgid "Cancel"
-msgstr ""
-
+msgstr "Annuler"
diff --git a/addons/report_sale/i18n/fr_FR.po b/addons/report_sale/i18n/fr_FR.po
index f6c6cf85b63..1ea4892a0af 100644
--- a/addons/report_sale/i18n/fr_FR.po
+++ b/addons/report_sale/i18n/fr_FR.po
@@ -4,44 +4,45 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:42+0000"
-"PO-Revision-Date: 2008-09-11 15:41:42+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 16:23+0000\n"
+"PO-Revision-Date: 2008-10-11 06:26+0000\n"
+"Last-Translator: Christophe Chauvet \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-14 11:01+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: report_sale
#: field:report.sale.order.category,price_average:0
#: field:report.sale.order.product,price_average:0
msgid "Average Price"
-msgstr ""
+msgstr "Prix moyen"
#. module: report_sale
#: field:report.sale.order.category,state:0
#: field:report.sale.order.product,state:0
msgid "Order State"
-msgstr ""
+msgstr "État commande"
#. module: report_sale
#: view:report.sale.order.category:0
msgid "Sales Orders by category"
-msgstr ""
+msgstr "Commmande de ventes par catégories"
#. module: report_sale
#: model:ir.model,name:report_sale.model_report_sale_order_product
msgid "Sales Orders by Products"
-msgstr ""
+msgstr "Commandes de ventes par Produits"
#. module: report_sale
#: model:ir.report.custom,title:report_sale.ir_report_custom_6
#: model:ir.report.custom,name:report_sale.ir_report_custom_6
msgid "Monthly cumulated sales turnover over one year"
-msgstr ""
+msgstr "Chiffres d'affaires Mensuel des ventes cumules depuis un an"
#. module: report_sale
#: model:ir.ui.menu,name:report_sale.next_id_82
@@ -50,74 +51,77 @@ msgstr "Tous les mois"
#. module: report_sale
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: report_sale
#: selection:report.sale.order.category,state:0
#: selection:report.sale.order.product,state:0
msgid "Waiting Schedule"
-msgstr ""
+msgstr "Attente d'exécution"
#. module: report_sale
#: field:report.sale.order.category,price_total:0
#: field:report.sale.order.product,price_total:0
msgid "Total Price"
-msgstr ""
+msgstr "Prix Total"
#. module: report_sale
#: field:report.sale.order.product,product_id:0
msgid "Product"
-msgstr ""
+msgstr "Produit"
#. module: report_sale
#: model:ir.model,name:report_sale.model_report_sale_order_category
msgid "Sales Orders by Categories"
-msgstr ""
+msgstr "Commandes de ventes par Catégories"
#. module: report_sale
#: model:ir.actions.act_window,name:report_sale.action_order_sale_list
#: model:ir.ui.menu,name:report_sale.menu_report_order_sale_list
msgid "Sales of the Month"
-msgstr ""
+msgstr "Ventes du Mois"
#. module: report_sale
#: model:ir.actions.act_window,name:report_sale.action_order_product_tree
#: model:ir.ui.menu,name:report_sale.menu_report_order_product
msgid "Sales by Product (this month)"
-msgstr ""
+msgstr "Ventes par Produit (Ce mois)"
#. module: report_sale
#: model:ir.report.custom,title:report_sale.ir_report_custom_4
#: model:ir.report.custom,name:report_sale.ir_report_custom_4
msgid "Monthly sales turnover over one year"
-msgstr ""
+msgstr "Chiffres d'affaires mensuel depuis un an"
#. module: report_sale
#: selection:report.sale.order.category,state:0
#: selection:report.sale.order.product,state:0
msgid "Invoice Exception"
-msgstr ""
+msgstr "Exception de facture"
#. module: report_sale
#: model:ir.actions.act_window,name:report_sale.action_order_category_tree_all
#: model:ir.ui.menu,name:report_sale.menu_report_order_category_all
#: view:report.sale.order.category:0
msgid "Sales by Category of Products"
-msgstr ""
+msgstr "Ventes par Catégorie de Produits"
#. module: report_sale
#: field:report.sale.order.category,quantity:0
#: field:report.sale.order.product,quantity:0
msgid "# of Products"
-msgstr ""
+msgstr "# de Produits"
#. module: report_sale
#: model:ir.actions.act_window,name:report_sale.action_order_product_tree_all
#: model:ir.ui.menu,name:report_sale.menu_report_order_product_all
#: view:report.sale.order.product:0
msgid "Sales by Product"
-msgstr ""
+msgstr "Ventes par Produit"
#. module: report_sale
#: model:ir.ui.menu,name:report_sale.next_id_81
@@ -127,23 +131,23 @@ msgstr "Ce mois"
#. module: report_sale
#: field:report.sale.order.category,category_id:0
msgid "Categories"
-msgstr ""
+msgstr "Catégories"
#. module: report_sale
#: selection:report.sale.order.category,state:0
#: selection:report.sale.order.product,state:0
msgid "Quotation"
-msgstr ""
+msgstr "Proposition"
#. module: report_sale
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue!"
#. module: report_sale
#: model:ir.ui.menu,name:report_sale.ir_ui_menu1
msgid "Monthly Sales Turnover Over One Year"
-msgstr ""
+msgstr "Chiffres d'affaires mensuel depuis un an"
#. module: report_sale
#: model:ir.ui.menu,name:report_sale.next_id_80
@@ -153,12 +157,12 @@ msgstr "Reporting"
#. module: report_sale
#: model:ir.ui.menu,name:report_sale.ir_ui_menu2
msgid "Daily Sales Turnover Over One Year"
-msgstr ""
+msgstr "Chiffres d'affaires journalier depuis un an"
#. module: report_sale
#: model:ir.ui.menu,name:report_sale.ir_ui_menu3
msgid "Monthly Cumulated Sales Turnover Over One Year"
-msgstr ""
+msgstr "Chiffres d'affaires mensuel des ventes cumulés depuis un an"
#. module: report_sale
#: view:sale.order:0
@@ -168,58 +172,57 @@ msgstr "Commandes"
#. module: report_sale
#: model:ir.ui.menu,name:report_sale.menu_report_order_category
msgid "Sales by Category of Product (this month)"
-msgstr ""
+msgstr "Ventes par Catgorie de Produit (ce mois)"
#. module: report_sale
#: selection:report.sale.order.category,state:0
#: selection:report.sale.order.product,state:0
msgid "Manual in progress"
-msgstr ""
+msgstr "Manuel en cours"
#. module: report_sale
#: selection:report.sale.order.category,state:0
#: selection:report.sale.order.product,state:0
msgid "Shipping Exception"
-msgstr ""
+msgstr "Exception de livraison"
#. module: report_sale
#: selection:report.sale.order.category,state:0
#: selection:report.sale.order.product,state:0
msgid "In progress"
-msgstr ""
+msgstr "En cours"
#. module: report_sale
#: model:ir.ui.menu,name:report_sale.next_id_83
msgid "Graphs"
-msgstr ""
+msgstr "Graphes"
#. module: report_sale
#: model:ir.report.custom,title:report_sale.ir_report_custom_5
#: model:ir.report.custom,name:report_sale.ir_report_custom_5
msgid "Daily sales turnover over one year"
-msgstr ""
+msgstr "Chiffres d'affaires journalier depuis un an"
#. module: report_sale
#: field:report.sale.order.category,name:0
#: field:report.sale.order.product,name:0
msgid "Month"
-msgstr ""
+msgstr "Mois"
#. module: report_sale
#: field:report.sale.order.category,count:0
#: field:report.sale.order.product,count:0
msgid "# of Lines"
-msgstr ""
+msgstr "# de lignes"
#. module: report_sale
#: selection:report.sale.order.category,state:0
#: selection:report.sale.order.product,state:0
msgid "Done"
-msgstr ""
+msgstr "Terminer"
#. module: report_sale
#: selection:report.sale.order.category,state:0
#: selection:report.sale.order.product,state:0
msgid "Cancel"
-msgstr ""
-
+msgstr "Annuler"
diff --git a/addons/report_timesheet/i18n/fr_FR.po b/addons/report_timesheet/i18n/fr_FR.po
index c0901d6098d..339aba59689 100644
--- a/addons/report_timesheet/i18n/fr_FR.po
+++ b/addons/report_timesheet/i18n/fr_FR.po
@@ -4,16 +4,17 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:42+0000"
-"PO-Revision-Date: 2008-09-11 15:41:42+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 16:24+0000\n"
+"PO-Revision-Date: 2008-10-11 07:04+0000\n"
+"Last-Translator: Christophe Chauvet \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-14 14:28+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: report_timesheet
#: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_date_stat_my
@@ -28,8 +29,11 @@ msgstr "Timesheets par utilisateur"
#. module: report_timesheet
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: report_timesheet
#: model:ir.model,name:report_timesheet.model_report_timesheet_account_date
@@ -67,7 +71,7 @@ msgstr "Timesheet à facturer"
#: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_date_stat_all
#: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_account_date_all
msgid "Daily Timesheet by Account"
-msgstr ""
+msgstr "Feuilles de présences jounalière par Compte"
#. module: report_timesheet
#: model:ir.actions.act_window,name:report_timesheet.act_res_users_2_report_timesheet_user
@@ -86,7 +90,7 @@ msgstr "Utilisateur"
#: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_stat_all
#: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_account_all
msgid "Timesheet by Account"
-msgstr ""
+msgstr "Feuilles de présence par Compte"
#. module: report_timesheet
#: field:report_timesheet.account.date,name:0
@@ -119,13 +123,13 @@ msgstr "Feuilles de présence par compte"
#. module: report_timesheet
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue!"
#. module: report_timesheet
#: model:ir.actions.act_window,name:report_timesheet.action_timesheet_user_stat_all
#: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_user_all
msgid "Timesheet by User"
-msgstr ""
+msgstr "Feuilles de présences par Utilisateur"
#. module: report_timesheet
#: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_stat_my
@@ -152,7 +156,7 @@ msgstr "Timesheet journalière par compte"
#: model:ir.actions.act_window,name:report_timesheet.action_timesheet_invoice_stat_all
#: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_invoice_all
msgid "Timesheet by Invoice"
-msgstr ""
+msgstr "Feuilles de présence par Facture"
#. module: report_timesheet
#: field:report_timesheet.account.date,quantity:0
@@ -199,4 +203,3 @@ msgstr "Coût"
#: model:ir.ui.menu,name:report_timesheet.next_id_69
msgid "This Month"
msgstr "Ce mois"
-
diff --git a/addons/sale/i18n/fr_FR.po b/addons/sale/i18n/fr_FR.po
index ddebdfdb64d..73dfc22901e 100644
--- a/addons/sale/i18n/fr_FR.po
+++ b/addons/sale/i18n/fr_FR.po
@@ -4,36 +4,28 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
-
-#. module: sale
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr ""
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 16:26+0000\n"
+"PO-Revision-Date: 2008-10-13 16:22+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-13 16:24+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
#: view:sale.order:0
msgid "Recreate Procurement"
msgstr "Recréer l'approvisionnement"
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr ""
-
#. module: sale
#: selection:sale.config.picking_policy,picking_policy:0
+#: selection:sale.order,picking_policy:0
msgid "All at once"
-msgstr ""
+msgstr "Tout en une fois"
#. module: sale
#: field:sale.order.line,address_allotment_id:0
@@ -50,6 +42,11 @@ msgstr "Recréer la Facture"
msgid "Waiting Schedule"
msgstr "Attente de programmation"
+#. module: sale
+#: rml:sale.order:0
+msgid "Total VAT:"
+msgstr "Total TVA:"
+
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
@@ -58,9 +55,8 @@ msgstr "Déclaration automatique"
#. module: sale
#: rml:sale.shipping:0
-#: model:ir.actions.report.xml,name:sale.report_shipping
-msgid "Delivery order"
-msgstr "Commande de livraison"
+msgid "Order date"
+msgstr "Date de commande"
#. module: sale
#: selection:sale.order,state:0
@@ -69,24 +65,25 @@ msgstr "Exception de facture"
#. module: sale
#: help:sale.order,picking_ids:0
-msgid "This is the list of picking list that have been generated for this invoice"
-msgstr "C'est le liste de liste de picking qui ont été généré pour cette facture"
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr ""
+"C'est le liste de liste de picking qui ont été généré pour cette facture"
+
+#. module: sale
+#: rml:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
#. module: sale
#: field:sale.order,client_order_ref:0
msgid "Customer Ref."
-msgstr ""
+msgstr "Réf. Client"
#. module: sale
-#, python-format
-#: code:addons/sale/sale.py:0
-msgid "You must first cancel all invoices attached to this sale order."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Make Invoice"
-msgstr ""
+#: selection:sale.order,state:0
+msgid "In progress"
+msgstr "En cours"
#. module: sale
#: field:sale.order.line,price_subtotal:0
@@ -111,7 +108,7 @@ msgstr "Origine"
#. module: sale
#: view:sale.order:0
msgid "Stock Moves"
-msgstr ""
+msgstr "Mouvements de stocks"
#. module: sale
#: selection:sale.order,order_policy:0
@@ -140,11 +137,6 @@ msgstr "Commande client"
msgid "Taxes"
msgstr "Taxes"
-#. module: sale
-#: rml:sale.order:0
-msgid "Net Total :"
-msgstr ""
-
#. module: sale
#: field:sale.order,order_policy:0
msgid "Shipping Policy"
@@ -158,7 +150,7 @@ msgstr "Nom du magasin"
#. module: sale
#: rml:sale.order:0
msgid "VAT"
-msgstr ""
+msgstr "TVA"
#. module: sale
#: field:sale.order,amount_total:0
@@ -170,7 +162,7 @@ msgstr "Total"
#: field:sale.order,shop_id:0
#: model:ir.ui.menu,name:sale.menu_action_shop_form
msgid "Shop"
-msgstr ""
+msgstr "Magasin"
#. module: sale
#: field:sale.order,partner_invoice_id:0
@@ -206,25 +198,35 @@ msgid "Procure Method"
msgstr "Méthode d'appro."
#. module: sale
-#: help:sale.order,state:0
-msgid "Gives the state of the quotation or sale order. The exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the packing list process (Shipping Exception). The 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to be on the date 'Date Ordered'."
-msgstr "Donne l'état du devis ou de la commande. L'état d'exception est automatiquement défini quand une opération d'annulation arrive dans la validation de facture (Exception de facture) ou dans le processus de colisage (Exception d'expédition). L'état 'En attente de planninfication' est défini lorsque la facture est confirmée mais en attente que le plannificateur soit à la date 'Date commandée'."
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Fax :"
+#: rml:sale.shipping:0
+msgid "Batch reference :"
msgstr ""
#. module: sale
-#: field:sale.order.line,price_net:0
-msgid "Net Price"
-msgstr "Prix net"
+#: model:ir.actions.act_window,name:sale.action_order_tree3
+#: model:ir.ui.menu,name:sale.menu_action_order_tree3
+msgid "Sales Order To Be Invoiced"
+msgstr "Commandes de ventes Facturables"
#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Commande client"
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you invoice based on ordered or shipped quantities. If the product "
+"is a service, shipped quantities means hours spent on the associated tasks."
+msgstr ""
+"La commande créera une proposition de facturation (facture brouillon). Les "
+"quantités commandées et facturées peuvent ne pas être les mêmes. Vous devez "
+"choisir si vous facturez sur base des quantités commandées ou expédiées. Si "
+"le produit est un service, les quantitées expédiées signifies les heures "
+"dépensées aux tâches associées."
+
#. module: sale
#: rml:sale.order:0
msgid "Order N° :"
@@ -251,6 +253,11 @@ msgstr "Toutes les commandes"
msgid "Shipping Address"
msgstr "Adresse d'expédition"
+#. module: sale
+#: rml:sale.order:0
+msgid "Disc. (%)"
+msgstr "Rem. (%)"
+
#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
@@ -278,9 +285,9 @@ msgid "Order Lines"
msgstr "Lignes de la commande"
#. module: sale
-#: rml:sale.order:0
-msgid "Disc.(%)"
-msgstr ""
+#: view:sale.order:0
+msgid "Set to Draft"
+msgstr "Mettre en brouillon"
#. module: sale
#: field:sale.order.line,invoice_lines:0
@@ -309,34 +316,28 @@ msgstr "Centre profit/coût"
msgid "Shipping address :"
msgstr "Adresse de livraison :"
-#. module: sale
-#, python-format
-#: code:addons/sale/sale.py:0
-msgid "Error !"
-msgstr ""
-
#. module: sale
#: view:sale.order:0
msgid "Manual Description"
msgstr "Description manuelle"
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr ""
-
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree1
#: model:ir.ui.menu,name:sale.menu_action_order_line_tree1
#: view:sale.order.line:0
msgid "Sales Order Lines"
-msgstr ""
+msgstr "Lignes de ventes"
#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Quantités commandées"
+#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Info supplémentaires"
+
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
#: model:ir.ui.menu,name:sale.menu_action_order_line_tree3
@@ -346,7 +347,7 @@ msgstr "Lignes librées et non-facturées"
#. module: sale
#: rml:sale.order:0
msgid "Total :"
-msgstr ""
+msgstr "Total :"
#. module: sale
#: field:sale.order.line,move_ids:0
@@ -356,12 +357,23 @@ msgstr "Mouvements de stock"
#. module: sale
#: field:sale.order,name:0
msgid "Order Reference"
-msgstr ""
+msgstr "Référence commande"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Info supplémentaires"
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sale order. The exception state is "
+"automatically set when a cancel operation occurs in the invoice validation "
+"(Invoice Exception) or in the packing list process (Shipping Exception). The "
+"'Waiting Schedule' state is set when the invoice is confirmed but waiting "
+"for the scheduler to be on the date 'Date Ordered'."
+msgstr ""
+"Donne l'état du devis ou de la commande. L'état d'exception est "
+"automatiquement défini quand une opération d'annulation arrive dans la "
+"validation de facture (Exception de facture) ou dans le processus de "
+"colisage (Exception d'expédition). L'état 'En attente de planninfication' "
+"est défini lorsque la facture est confirmée mais en attente que le "
+"plannificateur soit à la date 'Date commandée'."
#. module: sale
#: field:sale.order,pricelist_id:0
@@ -377,7 +389,7 @@ msgstr "Devis N° :"
#. module: sale
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue!"
#. module: sale
#: model:ir.model,name:sale.model_sale_shop
@@ -386,19 +398,30 @@ msgid "Sale Shop"
msgstr "Point de vente"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Mettre en brouillon"
-
-#. module: sale
-#: rml:sale.shipping:0
-msgid "Order Date"
+#: help:sale.order,order_policy:0
+msgid ""
+"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the packing order after the payment of this invoice.\n"
+" - The 'Shipping & Manual Invoice' will create the packing order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice.\n"
+" - The 'Invoice after delivery' choice will generate the draft invoice "
+"after the packing list have been finished.\n"
+" - The 'Invoice from the packings' choice is used to create an invoice "
+"during the packing process."
msgstr ""
+"La Politique de Livraison est utilisée pour synchroniser les factures et les "
+"opérations de livraison.\n"
+" - le choix \"Payer avant livraison\" générera d'abord les factures puis "
+"générera la commande de colisage après le paiement de cette facture.\n"
+" - \"Livraison & Factures manuelles\" créera la commande de colisage "
+"directement et attendra que l'utilisateur clique manuellement sur le bouton "
+"'Facture' pour générer la facture brouillon.\n"
+" - \"Facture après Livraison\" générera la facture brouillon après que la "
+"liste des colisage soit terminée. \n"
+" - \"Facture d'après Colisage\" est utilisé pour créer la facture pendant "
+"le processus de colisage."
#. module: sale
#: view:sale.order:0
@@ -415,15 +438,6 @@ msgstr "Approvisionnement"
msgid "Manual in progress"
msgstr "Manuel en cours"
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay before delivery' choice will first generate the invoice and then generate the packing order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the packing order directly and wait for the user to manually click on the 'Invoice' button to generate the draft invoice.\n"
-" - The 'Invoice after delivery' choice will generate the draft invoice after the packing list have been finished.\n"
-" - The 'Invoice from the packings' choice is used to create an invoice during the packing process."
-msgstr ""
-
#. module: sale
#: model:ir.actions.report.xml,name:sale.report_sale_order
msgid "Print Order"
@@ -444,7 +458,7 @@ msgstr "Grouper les factures"
#: model:ir.actions.act_window,name:sale.action_order_tree5
#: model:ir.ui.menu,name:sale.menu_action_order_tree5
msgid "All Quotations"
-msgstr ""
+msgstr "Toutes les propositions"
#. module: sale
#: field:sale.order.line,number_packages:0
@@ -457,21 +471,20 @@ msgid "Discount (%)"
msgstr "Escompte (%)"
#. module: sale
-#: selection:sale.order,state:0
-msgid "In progress"
-msgstr "En cours"
+#: rml:sale.shipping:0
+msgid "Order ref."
+msgstr "Réf. Commande"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree3
-#: model:ir.ui.menu,name:sale.menu_action_order_tree3
-msgid "Sales Order To Be Invoiced"
-msgstr ""
+#: field:sale.order.line,price_net:0
+msgid "Net Price"
+msgstr "Prix net"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree10
#: model:ir.ui.menu,name:sale.menu_action_order_tree10
msgid "My Quotations"
-msgstr "Mes devis "
+msgstr "Mes devis"
#. module: sale
#: view:sale.order:0
@@ -483,26 +496,20 @@ msgstr "Autres informations"
msgid "Shipping & Manual Invoice"
msgstr "Livraison et facture manuelle"
-#. module: sale
-#, python-format
-#: code:addons/sale/sale.py:0
-msgid "Could not cancel sale order !"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr ""
-
#. module: sale
#: selection:sale.order.line,state:0
msgid "Canceled"
msgstr "Annulé"
#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr ""
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Calculer"
+
+#. module: sale
+#: rml:sale.order:0
+msgid "Tel. :"
+msgstr "Tél. :"
#. module: sale
#: field:sale.order,user_id:0
@@ -510,20 +517,21 @@ msgid "Salesman"
msgstr "Vendeur"
#. module: sale
-#: rml:sale.order:0
-msgid "Our Salesman"
-msgstr ""
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Taxes :"
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sale order. "
+"The same sale order may have been invoiced in several times (by line for "
+"example)."
msgstr ""
+"C'est la liste des factures qui ont étées générées pour cette commande. Le "
+"même commande peut avoir été facturé en plusieurs fois (par lignes par "
+"example)."
#. module: sale
#: field:sale.order,invoiced_rate:0
#: field:sale.order.line,invoiced:0
msgid "Invoiced"
-msgstr ""
+msgstr "Facturer"
#. module: sale
#: field:sale.order,state:0
@@ -536,6 +544,11 @@ msgstr "État"
msgid "Payment accounts"
msgstr "Compte de paiement"
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Automatic Invoice after delivery"
+msgstr "Facture automatique après livraison"
+
#. module: sale
#: wizard_view:sale.order.line.make_invoice,init:0
#: wizard_button:sale.order.line.make_invoice,init,invoice:0
@@ -554,7 +567,7 @@ msgstr "Mes commandes en exception de livraison"
#: model:ir.actions.act_window,name:sale.action_order_tree2
#: model:ir.ui.menu,name:sale.menu_action_order_tree2
msgid "Sales in Exception"
-msgstr ""
+msgstr "Commandes en Exception"
#. module: sale
#: selection:sale.order.line,state:0
@@ -562,24 +575,20 @@ msgid "Draft"
msgstr "Brouillon"
#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid "The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks."
-msgstr "La commande créera une proposition de facturation (facture brouillon). Les quantités commandées et facturées peuvent ne pas être les mêmes. Vous devez choisir si vous facturez sur base des quantités commandées ou expédiées. Si le produit est un service, les quantitées expédiées signifies les heures dépensées aux tâches associées."
+#: rml:sale.shipping:0
+#: model:ir.actions.report.xml,name:sale.report_shipping
+msgid "Delivery order"
+msgstr "Commande de livraison"
#. module: sale
#: view:sale.order:0
msgid "Procurement Corrected"
msgstr "Approvisionnement corrigé"
-#. module: sale
-#: rml:sale.order:0
-msgid "VAT :"
-msgstr ""
-
#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Packings"
-msgstr ""
+msgstr "Colisage en relation"
#. module: sale
#: field:sale.order.line,product_uos_qty:0
@@ -589,13 +598,13 @@ msgstr "Quantité US"
#. module: sale
#: field:sale.order.line,state:0
msgid "Status"
-msgstr ""
+msgstr "État"
#. module: sale
#: field:sale.config.picking_policy,picking_policy:0
#: field:sale.order,picking_policy:0
msgid "Packing Policy"
-msgstr ""
+msgstr "Politique de Colisage"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree2
@@ -608,16 +617,10 @@ msgstr "Lignes non-facturées"
msgid "Product sales"
msgstr "Ventes de produit"
-#. module: sale
-#, python-format
-#: code:addons/sale/sale.py:0
-msgid "invalid mode for test_state"
-msgstr ""
-
#. module: sale
#: rml:sale.order:0
-msgid "0.00"
-msgstr ""
+msgid "Our Salesman"
+msgstr "Notre Vendeur"
#. module: sale
#: field:sale.order,invoiced:0
@@ -628,17 +631,13 @@ msgstr "Payé"
#: model:ir.actions.act_window,name:sale.action_order_form
#: model:ir.ui.menu,name:sale.menu_sale_order
msgid "Sales Orders"
-msgstr ""
+msgstr "Commandes de Ventes"
#. module: sale
#: selection:sale.config.picking_policy,picking_policy:0
+#: selection:sale.order,picking_policy:0
msgid "Direct Delivery"
-msgstr ""
-
-#. module: sale
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr ""
+msgstr "Livraison directe"
#. module: sale
#: field:sale.order.line,property_ids:0
@@ -659,25 +658,36 @@ msgid "My sales order in progress"
msgstr "Mes commandes en cours"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Set Default"
-msgstr ""
+#: model:ir.actions.act_window,name:sale.action_order_tree_new
+#: model:ir.ui.menu,name:sale.menu_action_order_tree_new
+msgid "New Sale Order / Quotation"
+msgstr "Nouvelle Commande / Devis"
#. module: sale
#: rml:sale.shipping:0
msgid "Designation"
msgstr "Désignation"
+#. module: sale
+#: rml:sale.order:0
+msgid "VAT :"
+msgstr "TVA :"
+
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
#: model:ir.ui.menu,name:sale.menu_action_order_tree4
msgid "Sales Order in Progress"
-msgstr ""
+msgstr "Commandes de Ventes en cours"
#. module: sale
#: selection:sale.order,order_policy:0
msgid "Payment before delivery"
-msgstr ""
+msgstr "Paiement avant livraison"
+
+#. module: sale
+#: rml:sale.shipping:0
+msgid "Logistical unit :"
+msgstr "Unité Logistiques"
#. module: sale
#: rml:sale.order:0
@@ -686,15 +696,14 @@ msgid "Quantity"
msgstr "Quantité"
#. module: sale
-#, python-format
-#: code:addons/sale/sale.py:0
-msgid "You must first cancel all packings attached to this sale order."
-msgstr ""
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr "Créer facture"
#. module: sale
#: rml:sale.order:0
msgid "Your Reference"
-msgstr ""
+msgstr "Votre Référence"
#. module: sale
#: field:sale.order.line,th_weight:0
@@ -715,7 +724,7 @@ msgstr "Factures associees"
#. module: sale
#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
msgid "Sales"
-msgstr "Ventes "
+msgstr "Ventes"
#. module: sale
#: view:sale.order:0
@@ -776,8 +785,11 @@ msgstr "Historique"
#. module: sale
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: sale
#: view:sale.order.line:0
@@ -802,9 +814,9 @@ msgid "Do you really want to create the invoices ?"
msgstr "Voulez-vous vraiment créer les factures ?"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calculer"
+#: view:sale.config.picking_policy:0
+msgid "Set Default"
+msgstr "Définir comme valeur par défaut"
#. module: sale
#: view:sale.order:0
@@ -814,7 +826,7 @@ msgstr "Commandes"
#. module: sale
#: view:sale.config.picking_policy:0
msgid "Configure Picking Policy for Sale Order"
-msgstr ""
+msgstr "Configurez la Politique de Colisage pour la Commande"
#. module: sale
#: field:sale.order,incoterm:0
@@ -847,21 +859,25 @@ msgstr "Gestion des ventes"
msgid "Price"
msgstr "Prix"
+#. module: sale
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity (UOM)"
+msgstr "Quantité (UP)"
+
#. module: sale
#: field:sale.order.line,product_uos:0
msgid "Product UOS"
msgstr "Unité secondaire"
#. module: sale
-#: rml:sale.order:0
-msgid "Tel. :"
-msgstr ""
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging used"
+msgstr "Colisage utilisé"
#. module: sale
-#, python-format
-#: code:addons/sale/sale.py:0
-msgid "Could not cancel this sale order !"
-msgstr ""
+#: field:sale.order.line,product_uom:0
+msgid "Product UOM"
+msgstr "UP produit"
#. module: sale
#: field:stock.move,sale_line_id:0
@@ -876,34 +892,29 @@ msgstr "Sur commande"
#. module: sale
#: model:ir.model,name:sale.model_sale_config_picking_policy
msgid "sale.config.picking_policy"
-msgstr ""
+msgstr "sale.config.picking_policy"
#. module: sale
#: help:sale.order,partner_order_id:0
-msgid "The name and address of the contact that requested the order or quotation."
+msgid ""
+"The name and address of the contact that requested the order or quotation."
msgstr "Le nom et l'adresse du contacte ayant demandé le devis."
#. module: sale
#: field:sale.order,partner_id:0
msgid "Customer"
-msgstr ""
+msgstr "Client"
#. module: sale
#: field:sale.config.picking_policy,name:0
msgid "Name"
-msgstr ""
+msgstr "Nom"
#. module: sale
#: field:sale.order,invoice_quantity:0
msgid "Invoice on"
msgstr "Facture sur"
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree_new
-#: model:ir.ui.menu,name:sale.menu_action_order_tree_new
-msgid "New Quotation"
-msgstr ""
-
#. module: sale
#: view:sale.order:0
msgid "Total amount"
@@ -913,12 +924,12 @@ msgstr "Montant total"
#: rml:sale.order:0
#: field:sale.order,date_order:0
msgid "Date Ordered"
-msgstr ""
+msgstr "Date de commande"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Automatic Invoice after delivery"
-msgstr "Facture automatique après livraison"
+#: rml:sale.order:0
+msgid "Net Total :"
+msgstr "Net a payer :"
#. module: sale
#: rml:sale.shipping:0
@@ -930,10 +941,15 @@ msgstr "Transporteur"
msgid "S.U."
msgstr "U.V."
+#. module: sale
+#: rml:sale.shipping:0
+msgid "Shipping date"
+msgstr "Date de livraison"
+
#. module: sale
#: rml:sale.order:0
msgid "Payment Terms"
-msgstr ""
+msgstr "Conditions de Paiement"
#. module: sale
#: view:sale.order:0
@@ -953,12 +969,7 @@ msgstr "Séquence"
#. module: sale
#: field:sale.order,payment_term:0
msgid "Payment Term"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid "This is the list of invoices that have been generated for this sale order. The same sale order may have been invoiced in several times (by line for example)."
-msgstr "C'est la liste des factures qui ont étées générées pour cette commande. Le même commande peut avoir été facturé en plusieurs fois (par lignes par example)."
+msgstr "Condition de paiement"
#. module: sale
#: view:sale.order:0
@@ -970,7 +981,7 @@ msgstr "États"
#: field:sale.order,picked_rate:0
#: field:sale.order,shipped:0
msgid "Picked"
-msgstr ""
+msgstr "Réceptionné"
#. module: sale
#: view:sale.shop:0
@@ -986,10 +997,9 @@ msgstr "Montant hors-taxes"
#: model:ir.actions.act_window,name:sale.action_order_tree
#: model:ir.ui.menu,name:sale.menu_action_order_tree
msgid "My Sales Order"
-msgstr "Mes commandes "
+msgstr "Mes commandes"
#. module: sale
#: model:ir.model,name:sale.model_sale_order_line
msgid "Sale Order line"
msgstr "Ligne de commande"
-
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index e6b7c1a3c52..d91109ae331 100644
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -23,6 +23,7 @@
+
@@ -34,6 +35,7 @@
+
@@ -85,10 +87,11 @@
-
+
+
@@ -96,10 +99,11 @@
-
+
+
@@ -118,6 +122,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -125,22 +141,9 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -148,28 +151,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -178,52 +160,15 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -249,25 +194,79 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/addons/sale/report/shipping.py b/addons/sale/report/shipping.py
index 55949fdeec1..7ecbe6bff9d 100644
--- a/addons/sale/report/shipping.py
+++ b/addons/sale/report/shipping.py
@@ -16,6 +16,17 @@ class shipping(report_sxw.rml_parse):
super(shipping, self).__init__(cr, uid, name, context)
self.localcontext.update({
'time': time,
+# 'sum_total': self._sum_total,
})
+
+# def _sum_total(self,data):
+# print "======data=======",data['id']
+# self.cr.execute("SELECT sum(pt.list_price*sm.product_qty) FROM stock_picking as sp "\
+# "LEFT JOIN stock_move sm ON (sp.id = sm.picking_id) "\
+# "LEFT JOIN product_product pp ON (sm.product_id = pp.id) "\
+# "LEFT JOIN product_template pt ON (pp.product_tmpl_id = pt.id) "\
+# "WHERE sm.picking_id = %d "%(data['id']))
+# sum_total = self.cr.fetchone()[0] or 0.00
+# return sum_total
report_sxw.report_sxw('report.sale.shipping','stock.picking','addons/sale/report/shipping.rml',parser=shipping)
diff --git a/addons/sale/report/shipping.rml b/addons/sale/report/shipping.rml
index 35bc22beba9..3e8f1105cde 100644
--- a/addons/sale/report/shipping.rml
+++ b/addons/sale/report/shipping.rml
@@ -60,9 +60,6 @@
-
-
-
@@ -71,21 +68,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -196,11 +178,8 @@
-
+
- |
- Reference
- |
Designation
|
@@ -208,13 +187,7 @@
Lot
- Quantity
- |
-
- Unit Price
- |
-
- Price
+ Quantity
|
@@ -223,16 +196,13 @@
[[ repeatIn(o.move_lines,'line') ]]
-
+
|
- [[line.product_id.code ]]
+ [[line.product_id.code ]] [[ line.product_id and line.product_id.name or '']]
|
- [[ line.product_id and line.product_id.name or '']]
- |
-
- [[ (line.prodlot_id and line.prodlot_id.name) or ' ' ]]
+ [[ (line.prodlot_id and line.prodlot_id.name) or ' ' ]]
|
[[ line.product_qty ]]
@@ -240,48 +210,14 @@
|
[[ line.product_uom and line.product_uom.name ]]
|
-
- [[ line.sale_line_id and line.sale_line_id.price_unit ]]
- |
-
- [[ line.sale_line_id and line.sale_line_id.price_subtotal ]]
- |
-
-
- |
-
-
-
- |
-
- Net Total :
- |
-
- [[ o.sale_id and o.sale_id.amount_untaxed ]]
- |
-
-
- |
-
-
-
- |
-
- Total :
- |
-
- [[ o.sale_id and o.sale_id.amount_total ]]
- |
-
-
-
+
\ No newline at end of file
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 31dc3ce1f83..8a48a5c582b 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -299,10 +299,9 @@ class sale_order(osv.osv):
if not part:
return {'value':{'partner_invoice_id': False, 'partner_shipping_id':False, 'partner_order_id':False, 'payment_term' : False}}
addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['delivery','invoice','contact'])
- pricelist = self.pool.get('res.partner').property_get(cr, uid,
- part,property_pref=['property_product_pricelist']).get('property_product_pricelist',False)
- payment_term = self.pool.get('res.partner').property_get(cr, uid,
- part,property_pref=['property_payment_term']).get('property_payment_term',False)
+ part = self.pool.get('res.partner').browse(cr, uid, part)
+ pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False
+ payment_term = part.property_payment_term and part.property_payment_term.id or False
return {'value':{'partner_invoice_id': addr['invoice'], 'partner_order_id':addr['contact'], 'partner_shipping_id':addr['delivery'], 'pricelist_id': pricelist, 'payment_term' : payment_term}}
def button_dummy(self, cr, uid, ids, context={}):
@@ -462,7 +461,8 @@ class sale_order(osv.osv):
def test_state(self, cr, uid, ids, mode, *args):
assert mode in ('finished', 'canceled'), _("invalid mode for test_state")
finished = True
- canceled = False
+ canceled = False
+ notcanceled = False
write_done_ids = []
write_cancel_ids = []
for order in self.browse(cr, uid, ids, context={}):
@@ -471,6 +471,8 @@ class sale_order(osv.osv):
finished = False
if line.procurement_id and line.procurement_id.state == 'cancel':
canceled = True
+ if line.procurement_id and line.procurement_id.state <> 'cancel':
+ notcanceled = True
# if a line is finished (ie its procuremnt is done or it has not procuremernt and it
# is not already marked as done, mark it as being so...
if ((not line.procurement_id) or line.procurement_id.state == 'done') and line.state != 'done':
@@ -486,6 +488,8 @@ class sale_order(osv.osv):
if mode=='finished':
return finished
elif mode=='canceled':
+ if notcanceled:
+ return False
return canceled
def action_ship_create(self, cr, uid, ids, *args):
@@ -732,6 +736,7 @@ class sale_order_line(osv.osv):
if uosqty:
pu = round(line.price_unit * line.product_uom_qty / uosqty,
int(config['price_accuracy']))
+ a = self.pool.get('account.fiscal.position').map_account(cr, uid, line.order_id.partner_id, a)
inv_id = self.pool.get('account.invoice.line').create(cr, uid, {
'name': line.name,
'account_id': a,
@@ -843,25 +848,10 @@ class sale_order_line(osv.osv):
if update_tax: #The quantity only have changed
result['delay'] = (product_obj.sale_delay or 0.0)
- taxes = self.pool.get('account.tax').browse(cr, uid,
- [x.id for x in product_obj.taxes_id])
- taxep = None
- if partner_id:
- taxep_id = self.pool.get('res.partner').property_get(cr, uid,
- partner_id,property_pref=['property_account_tax']).get('property_account_tax',False)
- if taxep_id:
- taxep=self.pool.get('account.tax').browse(cr, uid,taxep_id)
- if not taxep or not taxep.id:
- result['tax_id'] = [x.id for x in product_obj.taxes_id]
- else:
- res5 = [taxep.id]
- for t in taxes:
- if not t.tax_group==taxep.tax_group:
- res5.append(t.id)
- result['tax_id'] = res5
+ partner = partner_obj.browse(cr, uid, partner_id)
+ result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, partner, product_obj.taxes_id)
result['name'] = product_obj.partner_ref
-
domain = {}
if not uom and not uos:
result['product_uom'] = product_obj.uom_id.id
diff --git a/addons/sale/sale_report.xml b/addons/sale/sale_report.xml
index 8ced0a1c0dc..afb43b869c5 100644
--- a/addons/sale/sale_report.xml
+++ b/addons/sale/sale_report.xml
@@ -23,7 +23,7 @@
rml="sale/report/prepare_allot.rml"
auto="False"/>
-->
-
-
+
+
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 31c68c7c885..0ce98ed3971 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -1,5 +1,17 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_sale_shop,sale.shop,model_sale_shop,group_sale_user,1,0,0,0
-access_sale_order,sale.order,model_sale_order,group_sale_user,1,1,1,0
-access_sale_order_line,sale.order.line,model_sale_order_line,group_sale_user,1,1,1,0
-access_sale_shop_admin,sale.shop,model_sale_shop,base.group_system,1,1,1,1
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_sale_shop","sale.shop","model_sale_shop","group_sale_user",1,0,0,0
+"access_sale_order","sale.order","model_sale_order","group_sale_user",1,1,1,0
+"access_sale_order_line","sale.order.line","model_sale_order_line","group_sale_user",1,1,1,0
+"access_sale_shop_admin","sale.shop","model_sale_shop","base.group_system",1,1,1,1
+"access_sale_config_picking_policy","sale.config.picking_policy","model_sale_config_picking_policy","group_sale_user",1,0,0,0
+"access_sale_config_picking_policy_manager","sale.config.picking_policy_manager","model_sale_config_picking_policy","group_sale_manager",1,1,1,1
+"access_account_invoice_salesman","account_invoice salesman","account.model_account_invoice","group_sale_user",1,1,1,1
+"access_account_invoice_line_salesman","account_invoice.line salesman","account.model_account_invoice_line","group_sale_user",1,1,1,1
+"access_account_payment_term_salesman","account_payment_term salesman","account.model_account_payment_term","group_sale_user",1,0,0,0
+"access_account_analytic_account_salesman","account_analytic_account salesman","account.model_account_analytic_account","group_sale_user",1,1,1,1
+"access_stock_picking_salesman","stock_picking salesman","stock.model_stock_picking","group_sale_user",1,1,1,1
+"access_stock_move_salesman","stock_move salesman","stock.model_stock_move","group_sale_user",1,1,1,1
+"access_mrp_property_salesman","mrp.property salesman","mrp.model_mrp_property","group_sale_user",1,0,0,0
+"access_mrp_procurement_salesman","mrp.procurement salesman","mrp.model_mrp_procurement","group_sale_user",1,1,1,1
+"access_sale_order_stock_worker","sale.order stock worker","model_sale_order","stock.group_stock_user",1,0,0,0
+"access_sale_order_line_stock_worker","sale.order.line stock worker","model_sale_order_line","stock.group_stock_user",1,0,0,0
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 765c151a47e..9778e607ecf 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -1,6 +1,6 @@
-
+
Sale / Manager
@@ -9,5 +9,11 @@
Sale / Salesman
+
+
+
+
diff --git a/addons/sale_analytic_plans/i18n/fr_FR.po b/addons/sale_analytic_plans/i18n/fr_FR.po
index 61b5ccebe75..0355aa81f23 100644
--- a/addons/sale_analytic_plans/i18n/fr_FR.po
+++ b/addons/sale_analytic_plans/i18n/fr_FR.po
@@ -4,19 +4,19 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 16:25+0000\n"
+"PO-Revision-Date: 2008-10-13 16:22+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-13 16:28+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_analytic_plans
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
-
+msgstr "XML non valide pour l'architecture de la vue"
diff --git a/addons/sale_crm/__terp__.py b/addons/sale_crm/__terp__.py
index abb4374837d..c66bd1f2e6e 100644
--- a/addons/sale_crm/__terp__.py
+++ b/addons/sale_crm/__terp__.py
@@ -4,7 +4,7 @@
"version" : "1.0",
"author" : "Tiny",
"website" : "http://tinyerp.com/module_sale.html",
- "depends" : ["sale", "crm", "product", "account"],
+ "depends" : ["sale", "crm_configuration", "product", "account"],
"category" : "Generic Modules/Sales & Purchases",
"description": """
This module adds a shortcut on one or several cases in the CRM.
@@ -18,7 +18,9 @@
""",
"init_xml" : [],
"demo_xml" : [],
- "update_xml" : ["sale_crm_wizard.xml"],
+ "update_xml" : ["sale_crm_wizard.xml",
+ "process/sale_crm_process.xml"
+ ],
"active": False,
"installable": True
}
diff --git a/addons/sale_crm/i18n/fr_FR.po b/addons/sale_crm/i18n/fr_FR.po
index 8b276796b6c..690933e631a 100644
--- a/addons/sale_crm/i18n/fr_FR.po
+++ b/addons/sale_crm/i18n/fr_FR.po
@@ -4,92 +4,88 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:42+0000"
-"PO-Revision-Date: 2008-09-11 15:41:42+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 13:33+0000\n"
+"PO-Revision-Date: 2008-10-11 08:42+0000\n"
+"Last-Translator: Christophe Chauvet \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-14 13:44+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_crm
#: wizard_field:crm.case.make_order,init,shop_id:0
msgid "Shop"
-msgstr ""
+msgstr "Magasin"
#. module: sale_crm
#: wizard_field:crm.case.make_order,init,name:0
msgid "Order name"
-msgstr ""
+msgstr "Nom de la commande"
#. module: sale_crm
#: wizard_field:crm.case.make_order,init,partner_id:0
msgid "Default partner"
-msgstr ""
+msgstr "Partenaire par défaut"
#. module: sale_crm
#: wizard_field:sale_crm.make_case,init,name:0
msgid "Case Description"
-msgstr ""
+msgstr "Description du cas"
#. module: sale_crm
#: wizard_view:crm.case.make_order,init:0
#: wizard_button:crm.case.make_order,init,order:0
+#: model:ir.actions.wizard,name:sale_crm.sale_crm_wizard
msgid "Make Sale Order"
-msgstr ""
+msgstr "Créer une commande de vente"
#. module: sale_crm
#: wizard_field:sale_crm.make_case,init,user:0
msgid "User Responsible"
-msgstr ""
+msgstr "Responsable"
#. module: sale_crm
#: wizard_field:crm.case.make_order,init,analytic_account:0
msgid "Analytic account"
-msgstr ""
+msgstr "Compte analytique"
#. module: sale_crm
#: wizard_field:crm.case.make_order,init,picking_policy:0
msgid "Packing policy"
-msgstr ""
+msgstr "Règle de conditionnement"
#. module: sale_crm
#: wizard_field:crm.case.make_order,init,products:0
msgid "Products"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.actions.wizard,name:sale_crm.sale_crm_wizard
-msgid "Make Quotation"
-msgstr ""
+msgstr "Produits"
#. module: sale_crm
#: wizard_button:sale_crm.make_case,init,end:0
#: wizard_button:crm.case.make_order,init,end:0
msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
#. module: sale_crm
#: wizard_field:crm.case.make_order,init,close:0
msgid "Close"
-msgstr ""
+msgstr "Fermer"
#. module: sale_crm
#: wizard_field:sale_crm.make_case,init,description:0
msgid "Your action"
-msgstr ""
+msgstr "Votre action"
#. module: sale_crm
#: wizard_button:sale_crm.make_case,init,create:0
msgid "Create"
-msgstr ""
+msgstr "Créer"
#. module: sale_crm
#: wizard_view:sale_crm.make_case,init:0
#: model:ir.actions.wizard,name:sale_crm.sale_crm_make_case_wizard
msgid "Make Case"
-msgstr ""
-
+msgstr "Créer un Cas"
diff --git a/addons/sale_crm/process/sale_crm_process.xml b/addons/sale_crm/process/sale_crm_process.xml
new file mode 100644
index 00000000000..6aaa146b250
--- /dev/null
+++ b/addons/sale_crm/process/sale_crm_process.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/sale_journal/i18n/fr_FR.po b/addons/sale_journal/i18n/fr_FR.po
index 1dcfd4bfb51..3e2eba754d8 100644
--- a/addons/sale_journal/i18n/fr_FR.po
+++ b/addons/sale_journal/i18n/fr_FR.po
@@ -4,34 +4,35 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 16:04+0000\n"
+"PO-Revision-Date: 2008-10-13 16:29+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-13 16:44+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_journal_sale_stats
msgid "Monthly sales"
-msgstr ""
+msgstr "Ventes mensuelles"
#. module: sale_journal
#: selection:sale_journal.invoice.type.stats,state:0
#: selection:sale_journal.picking.stats,state:0
msgid "assigned"
-msgstr ""
+msgstr "Attribué"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open_menu_all
#: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open_menu_month
#: view:sale_journal.invoice.type.stats:0
msgid "Packings by invoice method"
-msgstr ""
+msgstr "Conditionnement par méthode de facturation"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_packing_lists
@@ -41,47 +42,47 @@ msgstr "Listes de colisage"
#. module: sale_journal
#: selection:sale_journal.sale.stats,state:0
msgid "Waiting Schedule"
-msgstr ""
+msgstr "Attente d'exécution"
#. module: sale_journal
#: selection:sale_journal.invoice.type.stats,invoice_state:0
msgid "to be invoiced"
-msgstr ""
+msgstr "à facturer"
#. module: sale_journal
#: model:ir.model,name:sale_journal.model_sale_journal_sale_journal
#: field:stock.picking,sale_journal_id:0
#: view:sale_journal.sale.journal:0
msgid "Sale Journal"
-msgstr ""
+msgstr "Journal de vente"
#. module: sale_journal
#: field:sale_journal.sale.journal,sale_stats_ids:0
msgid "Sale Stats"
-msgstr ""
+msgstr "Stats de vente"
#. module: sale_journal
#: view:sale_journal.picking.journal:0
#: view:sale_journal.sale.journal:0
msgid "Set to Draft"
-msgstr ""
+msgstr "Mettre au brouillon"
#. module: sale_journal
#: field:sale_journal.picking.journal,date:0
#: field:sale_journal.sale.journal,date:0
msgid "Journal date"
-msgstr ""
+msgstr "Date du journal"
#. module: sale_journal
#: help:res.partner,property_invoice_type:0
msgid "The type of journal used for sales and packings."
-msgstr ""
+msgstr "Le type de journal utilisé pour les ventes et les colisages"
#. module: sale_journal
#: view:sale_journal.picking.journal:0
#: view:sale_journal.sale.journal:0
msgid "Notes"
-msgstr ""
+msgstr "Notes"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal_tree
@@ -89,65 +90,65 @@ msgstr ""
#: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_all
#: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_month
msgid "Packings by journal"
-msgstr ""
+msgstr "Colisages par Journal"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.action_definition_journal_tree_my
msgid "My open journals"
-msgstr ""
+msgstr "Mes journaux ouverts"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking
msgid "Packings Journals"
-msgstr ""
+msgstr "Journaux de colisages"
#. module: sale_journal
#: field:sale_journal.invoice.type.stats,count:0
#: field:sale_journal.picking.stats,count:0
#: field:sale_journal.sale.stats,count:0
msgid "# of Lines"
-msgstr ""
+msgstr "# de lignes"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_byjournal_all
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_sales_all_open
msgid "All Open Journals"
-msgstr ""
+msgstr "Tous les journaux ouverts"
#. module: sale_journal
#: selection:sale_journal.picking.journal,state:0
#: selection:sale_journal.sale.journal,state:0
msgid "Draft"
-msgstr ""
+msgstr "Brouillon"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open
msgid "Statistics on packings to invoice"
-msgstr ""
+msgstr "Statistiques sur les colisages à facturer"
#. module: sale_journal
#: field:sale_journal.invoice.type.stats,price_average:0
#: field:sale_journal.picking.stats,price_average:0
#: field:sale_journal.sale.stats,price_average:0
msgid "Average Price"
-msgstr ""
+msgstr "Prix moyen"
#. module: sale_journal
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue!"
#. module: sale_journal
#: selection:sale_journal.invoice.type,invoicing_method:0
msgid "Grouped"
-msgstr ""
+msgstr "Groupé"
#. module: sale_journal
#: field:sale_journal.invoice.type.stats,state:0
#: field:sale_journal.picking.stats,state:0
#: field:sale_journal.sale.journal,state:0
msgid "State"
-msgstr ""
+msgstr "État"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting_all
@@ -160,7 +161,7 @@ msgstr "Tous les mois"
#: field:sale_journal.picking.stats,price_total:0
#: field:sale_journal.sale.stats,price_total:0
msgid "Total Price"
-msgstr ""
+msgstr "Prix Total"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting
@@ -171,23 +172,23 @@ msgstr "Reporting"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal_tree_my
msgid "My open packing journals"
-msgstr ""
+msgstr "Mes journaux de colisage ouvert"
#. module: sale_journal
#: model:ir.model,name:sale_journal.model_sale_journal_sale_stats
msgid "Sales Orders by Journal"
-msgstr ""
+msgstr "Commandes de ventes par Journal"
#. module: sale_journal
#: selection:sale_journal.invoice.type.stats,state:0
#: selection:sale_journal.picking.stats,state:0
msgid "waiting"
-msgstr ""
+msgstr "En attente"
#. module: sale_journal
#: model:ir.model,name:sale_journal.model_sale_journal_picking_journal
msgid "Packings Journal"
-msgstr ""
+msgstr "Journal de colisage"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_configuration
@@ -197,49 +198,49 @@ msgstr "Configuration"
#. module: sale_journal
#: selection:sale_journal.invoice.type.stats,invoice_state:0
msgid "None"
-msgstr ""
+msgstr "Aucun"
#. module: sale_journal
#: model:ir.model,name:sale_journal.model_sale_journal_invoice_type_stats
msgid "Stats on packings by invoice method"
-msgstr ""
+msgstr "Statistiques sur les colisages par methode de facturation"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.action_sale_sale_stats_open_menu_month
msgid "Sales by journal (this month)"
-msgstr ""
+msgstr "Ventes par journal (ce mois)"
#. module: sale_journal
#: selection:sale_journal.sale.stats,state:0
msgid "Manual in progress"
-msgstr ""
+msgstr "Manuel en cours"
#. module: sale_journal
#: selection:sale_journal.sale.stats,state:0
msgid "Shipping Exception"
-msgstr ""
+msgstr "Exception de livraison"
#. module: sale_journal
#: selection:sale_journal.sale.stats,state:0
msgid "In progress"
-msgstr ""
+msgstr "En cours"
#. module: sale_journal
#: field:sale_journal.invoice.type.stats,name:0
#: field:sale_journal.picking.stats,name:0
#: field:sale_journal.sale.stats,name:0
msgid "Month"
-msgstr ""
+msgstr "Mois"
#. module: sale_journal
#: field:sale_journal.invoice.type.stats,invoice_state:0
msgid "Invoice state"
-msgstr ""
+msgstr "État de la facture"
#. module: sale_journal
#: view:sale_journal.picking.stats:0
msgid "Packings by journals"
-msgstr ""
+msgstr "Colisages par journaux"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_sending_goods
@@ -249,96 +250,96 @@ msgstr "Livraison de marchandise"
#. module: sale_journal
#: field:sale_journal.sale.stats,state:0
msgid "Order State"
-msgstr ""
+msgstr "État commande"
#. module: sale_journal
#: view:sale_journal.picking.journal:0
msgid "Cancel Packings"
-msgstr ""
+msgstr "Annuler conditionnement"
#. module: sale_journal
#: field:sale_journal.invoice.type,note:0
#: field:sale_journal.picking.journal,note:0
#: field:sale_journal.sale.journal,note:0
msgid "Note"
-msgstr ""
+msgstr "Note"
#. module: sale_journal
#: selection:sale_journal.invoice.type.stats,state:0
#: selection:sale_journal.picking.stats,state:0
msgid "done"
-msgstr ""
+msgstr "terminer"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_assigned
#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_assigned
msgid "Assigned packings"
-msgstr ""
+msgstr "Colisages assignés"
#. module: sale_journal
#: selection:sale_journal.invoice.type.stats,state:0
#: selection:sale_journal.picking.stats,state:0
msgid "cancel"
-msgstr ""
+msgstr "annuler"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_open
msgid "Packings to invoice"
-msgstr ""
+msgstr "Colisages à facturer"
#. module: sale_journal
#: selection:sale_journal.sale.stats,state:0
msgid "Invoice Exception"
-msgstr ""
+msgstr "Exception de facture"
#. module: sale_journal
#: view:sale_journal.picking.journal:0
msgid "Packings"
-msgstr ""
+msgstr "Colisages"
#. module: sale_journal
#: field:sale_journal.picking.journal,date_validation:0
#: field:sale_journal.sale.journal,date_validation:0
msgid "Validation date"
-msgstr ""
+msgstr "Date da validation"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_byjournal
#: model:ir.ui.menu,name:sale_journal.menu_picking_picking_stats_open_all
#: model:ir.ui.menu,name:sale_journal.menu_picking_picking_stats_open_menu
msgid "Packings by Journal"
-msgstr ""
+msgstr "Colisages par journaux"
#. module: sale_journal
#: selection:sale_journal.invoice.type.stats,state:0
#: selection:sale_journal.picking.stats,state:0
msgid "draft"
-msgstr ""
+msgstr "brouillon"
#. module: sale_journal
#: field:sale_journal.invoice.type,active:0
msgid "Active"
-msgstr ""
+msgstr "Actif"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_invoice
msgid "Packings to Invoice"
-msgstr ""
+msgstr "Colisages à facturer"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_draft
msgid "Draft sales"
-msgstr ""
+msgstr "Ventes en brouillon"
#. module: sale_journal
#: selection:sale_journal.sale.stats,state:0
msgid "Quotation"
-msgstr ""
+msgstr "Proposition"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal
msgid "Sales Journals"
-msgstr ""
+msgstr "Journaux de ventes"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.action_invoice_type_tree
@@ -348,93 +349,96 @@ msgstr ""
#. module: sale_journal
#: view:sale_journal.sale.journal:0
msgid "Confirm Sales"
-msgstr ""
+msgstr "Confirmer les Ventes"
#. module: sale_journal
#: field:sale_journal.picking.journal,date_created:0
#: field:sale_journal.picking.journal,state:0
#: field:sale_journal.sale.journal,date_created:0
msgid "Creation date"
-msgstr ""
+msgstr "Date de création"
#. module: sale_journal
#: field:res.partner,property_invoice_type:0
msgid "Invoicing Method"
-msgstr ""
+msgstr "Méthode de facturation"
#. module: sale_journal
#: field:sale_journal.picking.journal,code:0
#: field:sale_journal.sale.journal,code:0
msgid "Code"
-msgstr ""
+msgstr "Code"
#. module: sale_journal
#: view:sale_journal.picking.journal:0
#: view:sale_journal.sale.journal:0
msgid "Open Journal"
-msgstr ""
+msgstr "Ouvrir journal"
#. module: sale_journal
#: view:sale_journal.sale.journal:0
msgid "Sales"
-msgstr ""
+msgstr "Ventes"
#. module: sale_journal
#: view:sale_journal.picking.journal:0
msgid "Packing Journal"
-msgstr ""
+msgstr "Journal de colisage"
#. module: sale_journal
#: selection:sale_journal.picking.journal,state:0
#: selection:sale_journal.sale.journal,state:0
#: selection:sale_journal.sale.stats,state:0
msgid "Done"
-msgstr ""
+msgstr "Terminer"
#. module: sale_journal
#: selection:sale_journal.sale.stats,state:0
msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
#. module: sale_journal
#: field:sale_journal.picking.journal,picking_stats_ids:0
msgid "Journal Stats"
-msgstr ""
+msgstr "Statistiques des Journaux"
#. module: sale_journal
#: selection:sale_journal.picking.journal,state:0
#: selection:sale_journal.sale.journal,state:0
msgid "Open"
-msgstr ""
+msgstr "Ouvert"
#. module: sale_journal
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: sale_journal
#: field:sale_journal.picking.journal,user_id:0
#: field:sale_journal.sale.journal,user_id:0
msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_byjournal_my
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_sales_my_open
msgid "My Open Journals"
-msgstr ""
+msgstr "Mes Journaux Ouverts"
#. module: sale_journal
#: view:sale_journal.sale.journal:0
msgid "Cancel Sales"
-msgstr ""
+msgstr "Ventes Annulées"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_invoice_method
#: model:ir.ui.menu,name:sale_journal.menu_invoice_type_picking_stats_open_all
#: model:ir.ui.menu,name:sale_journal.menu_invoice_type_picking_stats_open_menu
msgid "Packings by Invoice Method"
-msgstr ""
+msgstr "Colisages par méthode de facturation"
#. module: sale_journal
#: field:sale_journal.invoice.type,name:0
@@ -442,30 +446,30 @@ msgstr ""
#: field:stock.picking,invoice_type_id:0
#: view:sale_journal.invoice.type:0
msgid "Invoice Type"
-msgstr ""
+msgstr "Type de facture"
#. module: sale_journal
#: selection:sale_journal.invoice.type.stats,invoice_state:0
msgid "invoiced"
-msgstr ""
+msgstr "Facturé"
#. module: sale_journal
#: selection:sale_journal.invoice.type.stats,state:0
#: selection:sale_journal.picking.stats,state:0
msgid "confirmed"
-msgstr ""
+msgstr "Confirmé"
#. module: sale_journal
#: model:ir.model,name:sale_journal.model_sale_journal_picking_stats
msgid "Packing lists by Journal"
-msgstr ""
+msgstr "Listes des colisages par journaux"
#. module: sale_journal
#: field:sale_journal.invoice.type.stats,quantity:0
#: field:sale_journal.picking.stats,quantity:0
#: field:sale_journal.sale.stats,quantity:0
msgid "Quantities"
-msgstr ""
+msgstr "Quantités"
#. module: sale_journal
#: field:sale_journal.picking.journal,name:0
@@ -477,24 +481,24 @@ msgstr ""
#: view:sale_journal.picking.journal:0
#: view:sale_journal.sale.journal:0
msgid "Journal"
-msgstr ""
+msgstr "Journal"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_confirmed
#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_confirmed
msgid "Confirmed packings"
-msgstr ""
+msgstr "Colisages Confirmés"
#. module: sale_journal
#: field:sale_journal.invoice.type,invoicing_method:0
#: field:sale_journal.invoice.type.stats,invoice_type_id:0
msgid "Invoicing method"
-msgstr ""
+msgstr "Méthode de facturation"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal
msgid "Packings journals"
-msgstr ""
+msgstr "Journaux de colisages"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting_this
@@ -508,43 +512,42 @@ msgstr "Ce mois"
#: model:ir.ui.menu,name:sale_journal.menu_sale_sale_stats_open_menu
#: view:sale_journal.sale.stats:0
msgid "Sales by Journal"
-msgstr ""
+msgstr "Ventes par Journa"
#. module: sale_journal
#: selection:sale_journal.invoice.type,invoicing_method:0
msgid "Non grouped"
-msgstr ""
+msgstr "Non groupées"
#. module: sale_journal
#: view:sale_journal.picking.journal:0
#: view:sale_journal.sale.journal:0
msgid "Journal Information"
-msgstr ""
+msgstr "Information Journal"
#. module: sale_journal
#: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
msgid "Invoice Types"
-msgstr ""
+msgstr "Types de facture"
#. module: sale_journal
#: view:sale_journal.picking.journal:0
#: view:sale_journal.sale.journal:0
msgid "States"
-msgstr ""
+msgstr "États"
#. module: sale_journal
#: view:sale_journal.picking.journal:0
#: view:sale_journal.sale.journal:0
msgid "Close Journal"
-msgstr ""
+msgstr "Fermer Journal"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type
msgid "Invoicing Methods"
-msgstr ""
+msgstr "Méthodes de facturation"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_approved
msgid "Approved sales"
-msgstr ""
-
+msgstr "Ventes Approuvées"
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 17975fe9755..a0b397282e8 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -285,9 +285,9 @@
form
-
+
-
+
diff --git a/addons/sale_journal/security/ir.model.access.csv b/addons/sale_journal/security/ir.model.access.csv
index 513e65e741e..e199ad1e30b 100644
--- a/addons/sale_journal/security/ir.model.access.csv
+++ b/addons/sale_journal/security/ir.model.access.csv
@@ -1,10 +1,14 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_sale_journal_invoice_type_stats,sale_journal.invoice.type.stats,model_sale_journal_invoice_type_stats,sale.group_sale_user,1,0,0,0
-access_sale_journal_picking_stats,sale_journal.picking.stats,model_sale_journal_picking_stats,sale.group_sale_user,1,0,0,0
-access_sale_journal_invoice_type,sale_journal.invoice.type,model_sale_journal_invoice_type,sale.group_sale_user,1,0,0,0
-access_sale_journal_sale_journal,sale_journal.sale.journal,model_sale_journal_sale_journal,sale.group_sale_user,1,0,0,0
-access_sale_journal_picking_journal,sale_journal.picking.journal,model_sale_journal_picking_journal,sale.group_sale_user,1,0,0,0
-access_sale_journal_sale_stats,sale_journal.sale.stats,model_sale_journal_sale_stats,sale.group_sale_user,1,0,0,0
-access_sale_journal_invoice_type_manager,sale_journal.invoice.type.manager,model_sale_journal_invoice_type,sale.group_sale_manager,1,1,1,1
-access_sale_journal_sale_journal_manager,sale_journal.sale.journal.manager,model_sale_journal_sale_journal,sale.group_sale_manager,1,1,1,1
-access_sale_journal_picking_journal_manager,sale_journal.picking.journal.manager,model_sale_journal_picking_journal,sale.group_sale_manager,1,1,1,1
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_sale_journal_invoice_type_stats","sale_journal.invoice.type.stats","model_sale_journal_invoice_type_stats","sale.group_sale_user",1,0,0,0
+"access_sale_journal_picking_stats","sale_journal.picking.stats","model_sale_journal_picking_stats","sale.group_sale_user",1,0,0,0
+"access_sale_journal_invoice_type","sale_journal.invoice.type","model_sale_journal_invoice_type","sale.group_sale_user",1,0,0,0
+"access_sale_journal_invoice_type_partner_manager","sale_journal.invoice.type partner manager","model_sale_journal_invoice_type","base.group_partner_manager",1,0,0,0
+"access_sale_journal_sale_journal","sale_journal.sale.journal","model_sale_journal_sale_journal","sale.group_sale_user",1,0,0,0
+"access_sale_journal_picking_journal","sale_journal.picking.journal","model_sale_journal_picking_journal","sale.group_sale_user",1,0,0,0
+"access_sale_journal_sale_stats","sale_journal.sale.stats","model_sale_journal_sale_stats","sale.group_sale_user",1,0,0,0
+"access_sale_journal_invoice_type_manager","sale_journal.invoice.type.manager","model_sale_journal_invoice_type","sale.group_sale_manager",1,1,1,1
+"access_sale_journal_sale_journal_manager","sale_journal.sale.journal.manager","model_sale_journal_sale_journal","sale.group_sale_manager",1,1,1,1
+"access_sale_journal_picking_journal_manager","sale_journal.picking.journal.manager","model_sale_journal_picking_journal","sale.group_sale_manager",1,1,1,1
+"access_sale_journal_sale_journal_stock_worker","sale_journal.sale.journal stock worker","model_sale_journal_sale_journal","stock.group_stock_user",1,0,0,0
+"access_sale_journal_picking_journal_stock_worker","sale_journal.picking.journal stock worker","model_sale_journal_picking_journal","stock.group_stock_user",1,0,0,0
+"access_sale_journal_invoice_type_stock_worker","sale_journal.invoice_type stock worker","model_sale_journal_invoice_type","stock.group_stock_user",1,0,0,0
diff --git a/addons/sandwich/__init__.py b/addons/sandwich/__init__.py
new file mode 100644
index 00000000000..25aa31ed040
--- /dev/null
+++ b/addons/sandwich/__init__.py
@@ -0,0 +1,6 @@
+# -*- encoding: utf-8 -*-
+import sandwich
+import report
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sandwich/__terp__.py b/addons/sandwich/__terp__.py
new file mode 100644
index 00000000000..12fe33dbb1d
--- /dev/null
+++ b/addons/sandwich/__terp__.py
@@ -0,0 +1,14 @@
+# -*- encoding: utf-8 -*-
+{
+ "name" : "Sandwich Module",
+ "author" : "Tiny",
+ "version" : "1.0",
+ "category" : "Generic Modules/Others",
+ "depends" : ["base", "product"],
+ "demo_xml" : ["sandwich_demo.xml"],
+ "update_xml" : ["sandwich_view.xml", "sandwich_report.xml", "sandwich_wizard.xml"],
+ "active": False,
+ "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sandwich/report/__init__.py b/addons/sandwich/report/__init__.py
new file mode 100644
index 00000000000..b161da86f17
--- /dev/null
+++ b/addons/sandwich/report/__init__.py
@@ -0,0 +1,4 @@
+# -*- encoding: utf-8 -*-
+import sandwich_report
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sandwich/report/sandwich_report.py b/addons/sandwich/report/sandwich_report.py
new file mode 100644
index 00000000000..c98d0ef65e3
--- /dev/null
+++ b/addons/sandwich/report/sandwich_report.py
@@ -0,0 +1,45 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+
+import time
+from report import report_sxw
+
+#
+# sandwich command report
+#
+class sandwich_order_print(report_sxw.rml_parse):
+ def __init__(self, cr, uid, name, context):
+ super(sandwich_order_print, self).__init__(cr, uid, name, context)
+ self.localcontext.update( {
+ 'time': time,
+ })
+
+report_sxw.report_sxw('report.sandwich.order.print','sandwich.order','addons/sandwich/report/sandwich_report.rml',parser=sandwich_order_print)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sandwich/report/sandwich_report.rml b/addons/sandwich/report/sandwich_report.rml
new file mode 100644
index 00000000000..e6f63c37d9a
--- /dev/null
+++ b/addons/sandwich/report/sandwich_report.rml
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [[ repeatIn(objects, 'o') ]]
+
+
+ |
+
+
+
+ |
+
+ [[ o.partner['name'] ]]
+ [[ o.partner.address[0]['street'] ]]
+ [[ o.partner.address[0]['street2'] ]]
+ [[ o.partner.address[0]['zip'] ]], [[ o.partner.address[0]['city'] ]]
+ [[ o.partner.address[0].state_id['name'] ]]
+ [[ o.partner.address[0].country_id['name'] ]]
+
+
+
+
+
+
+ Phone : [[ o.partner.address[0]['phone'] ]]
+ FAX : [[ o.partner.address[0]['fax'] ]]
+ |
+
+
+
+
+
+
+
+
+ Document : [[ o['name'] ]]
+ Date : [[ o['date'] ]]
+ Printing date : [[ time.strftime('%d/%m/%Y') ]]
+
+
+
+
+
+
+
+
+ |
+ Item
+ |
+
+ Quantity
+ |
+
+ User
+ |
+
+ Unit price
+ |
+
+ Total Price
+ |
+
+
+ |
+ [[ repeatIn(o.order_lines, 'a') ]]
+ [[ a.product_id['name'] ]]
+ |
+
+ [[ a['quantity'] ]]
+ |
+
+ [[ a.user_id['login'] ]]
+ |
+
+ [[ a.product_id['price'] ]]
+ |
+
+ [[ a.product_id['price'] * a['quantity'] ]]
+ |
+
+
+
+
+
+
+
+
+ [[ o['note'] ]]
+
+
+
+
+
+
+
+
+
diff --git a/addons/sandwich/sandwich.py b/addons/sandwich/sandwich.py
new file mode 100644
index 00000000000..457c91b398b
--- /dev/null
+++ b/addons/sandwich/sandwich.py
@@ -0,0 +1,101 @@
+# -*- encoding: utf-8 -*-
+import time
+
+from osv import osv, fields
+import pooler
+
+#
+# Type of type of products (food, drink, lsd, other...)
+#
+class sandwich_product_type(osv.osv):
+ _name = 'sandwich.product.type'
+ _columns = {
+ 'name': fields.char('Name of the type', size=20, required=True),
+ 'description': fields.char('Type\'s description', size=255),
+ }
+sandwich_product_type()
+
+
+#
+# Type Of Sandwich
+#
+class sandwich_product(osv.osv):
+ _name = 'sandwich.product'
+ _columns = {
+ 'name': fields.char('Product name', size=50, required=True),
+ 'price': fields.float('Product price'),
+ 'product_type_id': fields.many2one('sandwich.product.type','Type of product'),
+ }
+sandwich_product()
+
+
+#
+# Sandwich command
+#
+class sandwich_order(osv.osv):
+ _name = 'sandwich.order'
+ _columns = {
+ 'name': fields.char('Name', size=50, required=True),
+ 'date': fields.date('Order date'),
+ 'order_lines': fields.one2many('sandwich.order.line','order_id','Order lines'),
+ 'note': fields.text('Notes'),
+ 'partner': fields.many2one('res.partner','Partner', required=True),
+ }
+ _defaults = {
+ 'date': lambda *a: time.strftime('%Y-%m-%d'),
+ }
+sandwich_order()
+
+
+#
+# Sandwich lines of command
+#
+class sandwich_order_line(osv.osv):
+ _name = 'sandwich.order.line'
+ _columns = {
+ 'name': fields.char('Description', size=50, required=True),
+ 'product_id': fields.many2one('sandwich.product', 'Product'),
+ 'user_id': fields.many2one('res.users', 'User id', required=True),
+ 'quantity': fields.integer('Quantity', required=True),
+ 'order_id': fields.many2one('sandwich.order', 'Order'),
+ 'date': fields.date('Date'),
+ 'product_type_id':fields.many2one('sandwich.product.type','Product type',change_default=True),
+ }
+ _defaults = {
+ 'date': lambda *a: time.strftime('%Y-%m-%d'),
+ 'user_id': lambda self, cr, uid, c: uid,
+ 'quantity': lambda *a: 1
+ }
+
+ def onchange_user_id(self, cr, uid, id, user_id, product_type_id, context={}, *args):
+ # print id, user_id, product_type_id, context
+ if (not user_id) or (not product_type_id):
+ return {}
+ cr.execute('SELECT product_id,name,quantity FROM sandwich_order_line WHERE user_id=%d AND product_type_id=%d ORDER BY date DESC LIMIT 1', (user_id, product_type_id))
+ res = cr.dictfetchone()
+ if res:
+ return {'value': res}
+ # else
+ return {'value': {'product_id': False, 'name': '', 'quantity': 1}}
+
+ def onchange_product_type_id(self, cr, uid, id, user_id, product_type_id, context={}):
+ if (not product_type_id) or (not user_id):
+ return {}
+ cr.execute('SELECT product_id,name,quantity FROM sandwich_order_line WHERE user_id=%d AND product_type_id=%d ORDER BY date DESC LIMIT 1', (user_id, product_type_id))
+ res = cr.dictfetchone()
+ if res:
+ return {'value': res}
+ # else
+ return {'value': {'product_id': False, 'name': '', 'quantity': 1}}
+
+ def onchange_product_id(self, cr, uid, id, product_id, context={}):
+ if not product_id:
+ return {}
+ res = pooler.get_pool(cr.dbname).get('sandwich.product').read(cr, uid, [ product_id ], ['name','product_type_id'])
+ return {'value': res}
+ #return {'value': {'name': name or product_id.name, 'product_type_id': product_id.product_type_id}}
+
+sandwich_order_line()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sandwich/sandwich_demo.xml b/addons/sandwich/sandwich_demo.xml
new file mode 100644
index 00000000000..adc6a4e6c6f
--- /dev/null
+++ b/addons/sandwich/sandwich_demo.xml
@@ -0,0 +1,81 @@
+
+
+
+
+ sandwich
+ something to eat
+
+
+ drink
+ Something to drink
+
+
+ candy
+ so sweeeeeet, but so bad for your teeth...
+
+
+
+ club
+ 2.00
+
+
+
+ chicken-curry
+ 2.00
+
+
+
+ Tuna
+ 2.50
+
+
+
+ cheese
+ 1.50
+
+
+
+
+ Little Coke 0.5l
+ 1.05
+
+
+
+ Coke 1.0l
+ 2.00
+
+
+
+ Big Coke 2.0l
+ 3.50
+
+
+
+ Cecemel
+ 1.35
+
+
+
+ water
+ 0.75
+
+
+
+
+ Mars
+ 0.80
+
+
+
+ Snickers
+ 0.80
+
+
+
+ Twix
+ 1.00
+
+
+
+
+
diff --git a/addons/sandwich/sandwich_report.xml b/addons/sandwich/sandwich_report.xml
new file mode 100644
index 00000000000..2c3d8cbee3a
--- /dev/null
+++ b/addons/sandwich/sandwich_report.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
diff --git a/addons/sandwich/sandwich_view.xml b/addons/sandwich/sandwich_view.xml
new file mode 100644
index 00000000000..4aa8390879e
--- /dev/null
+++ b/addons/sandwich/sandwich_view.xml
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+ sandwich.product.type
+ sandwich.product.type
+ form
+
+
+
+
+
+ sandwich.product.type
+ sandwich.product.type
+ tree
+
+
+
+
+
+
+
+
+
+ sandwich.product.type
+ form
+ form,tree
+ []
+
+
+
+
+
+
+
+ sandwich.product
+ sandwich.product
+ tree
+
+
+
+
+
+
+
+
+
+ sandwich.product
+ sandwich.product
+ form
+
+
+
+
+
+
+ sandwich.product
+ form
+ tree,form
+ []
+
+
+
+
+
+ sandwich.order.line.tree
+ sandwich.order.line
+ tree
+
+
+
+
+
+
+
+
+
+
+
+ sandwich.order.line.form
+ sandwich.order.line
+ form
+
+
+
+
+
+
+ sandwich.order.line
+ form
+ []
+
+
+
+
+
+
+ My order lines
+ sandwich.order.line
+ form
+ tree,form
+ [('user_id','=',uid)]
+
+
+
+
+
+ My order lines of the day
+ sandwich.order.line
+ form
+ tree,form
+ [('user_id','=',uid),('date','=',time.strftime('%Y-%m-%d'))]
+
+
+
+
+
+ Order lines of the day
+ sandwich.order.line
+ form
+ tree,form
+ [('date','=',time.strftime('%Y-%m-%d'))]
+
+
+
+
+
+ sandwich.order.tree
+ sandwich.order
+ tree
+
+
+
+
+
+
+
+
+
+
+ sandwich.order.form
+ sandwich.order
+ form
+
+
+
+
+
+ Today's orders
+ sandwich.order
+ form
+ tree,form
+
+ [('date','=',time.strftime('%Y-%m-%d'))]
+
+
+
+
+
+
+
diff --git a/addons/sandwich/sandwich_wizard.xml b/addons/sandwich/sandwich_wizard.xml
new file mode 100644
index 00000000000..e325c784921
--- /dev/null
+++ b/addons/sandwich/sandwich_wizard.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+ Create Order of the day
+ sandwich.order_create
+
+
+
+
+
+
+
diff --git a/addons/sandwich/wizard/__init__.py b/addons/sandwich/wizard/__init__.py
new file mode 100644
index 00000000000..c26cfc23f4e
--- /dev/null
+++ b/addons/sandwich/wizard/__init__.py
@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+import sandwich_wizard
+import order_create
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sandwich/wizard/order_create.py b/addons/sandwich/wizard/order_create.py
new file mode 100644
index 00000000000..744553938fa
--- /dev/null
+++ b/addons/sandwich/wizard/order_create.py
@@ -0,0 +1,83 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: makesale.py 1183 2005-08-23 07:43:32Z pinky $
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+from mx.DateTime import now
+
+import wizard
+import netsvc
+import ir
+import pooler
+
+sale_form = """
+"""
+
+sale_fields = {
+ 'name' : {'string' : 'Order name', 'type': 'char'},
+ 'partner_id' : {'string':'Suplier', 'relation':'res.partner', 'type':'many2one'},
+}
+
+class make_sale(wizard.interface):
+ def _makeOrder(self, cr, uid, data, context):
+ order = pooler.get_pool(cr.dbname).get('sandwich.order')
+ line = pooler.get_pool(cr.dbname).get('sandwich.order.line')
+ oid = order.create(cr, uid, {
+ 'name': data['form']['name'],
+ 'partner': data['form']['partner_id'],
+ })
+ name=data['form']['name']
+ cr.execute('update sandwich_order_line set order_id=%d where order_id is null', (oid,))
+ value = {
+ 'domain': "[('id','in',["+str(oid)+"])]",
+ 'name': "Create Sandwich Orders:"+name,
+ 'view_type': 'form',
+ 'view_mode': 'form,tree',
+ 'res_model': 'sandwich.order',
+ 'view_id': False,
+ 'type': 'ir.actions.act_window',
+ 'res_id': oid
+ }
+ return value
+
+ states = {
+ 'init' : {
+ 'actions' : [],
+ 'result' : {'type' : 'form', 'arch' : sale_form, 'fields' : sale_fields, 'state' : [('end', 'Cancel'),('order', 'Make an order')]}
+ },
+ 'order' : {
+ 'actions': [],
+ 'result': {'type': 'action', 'action': _makeOrder, 'state':'end'},
+ }
+ }
+make_sale('sandwich.order_create')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sandwich/wizard/sandwich_wizard.py b/addons/sandwich/wizard/sandwich_wizard.py
new file mode 100644
index 00000000000..21be195546f
--- /dev/null
+++ b/addons/sandwich/wizard/sandwich_wizard.py
@@ -0,0 +1,131 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+import wizard
+import pooler
+
+#
+# This class fill in the order with kind of automatically generated order lines, based on the last order for a user concerning a type of product
+#
+class sandwich_order_wizard(wizard.interface):
+
+ def _sandwich_order_wizard_order(self, cr, uid, data, context):
+ if not len(data['ids']):
+ return {}
+ cr.execute('update sandwich_order_line set order_id=%d where order_id is null', (data['ids'][0],))
+ for order in pooler.get_pool(cr.dbname).get('sandwich.order').browse(cr, uid, data['ids']):
+ for user_id in data['form']['user_id'][0][2]:
+ for producttype in data['form']['product_type_id'][0][2]:
+ if not pooler.get_pool(cr.dbname).get('sandwich.order.line').search(cr, uid, [('user_id','=',user_id),('product_type_id','=',producttype),('order_id','=',order.id)]):
+ vals = {
+ 'user_id': user_id,
+ 'order_id': order.id,
+ 'date': order.date,
+ 'product_type_id': producttype
+ }
+ vals.update( pooler.get_pool(cr.dbname).get('sandwich.order.line').onchange_user_id(cr, uid, uid, user_id, producttype)['value'] )
+ pooler.get_pool(cr.dbname).get('sandwich.order.line').create(cr, uid, vals)
+ return {}
+
+ _sandwich_order_wizard_form = '''
+ '''
+
+ _sandwich_order_wizard_fields = {
+ 'user_id': {'string': 'User', 'type': 'many2many','relation':'res.users'},
+ 'product_type_id': {'string': 'Product', 'type': 'many2many', 'relation':'sandwich.product.type'},
+ }
+
+ states = {
+ 'init': {
+ 'actions': [],
+ 'result': {'type': 'form', 'arch':_sandwich_order_wizard_form, 'fields':_sandwich_order_wizard_fields, 'state':[('end','Cancel'),('complete','Complete order')]}
+ },
+ 'complete': {
+ 'actions': [_sandwich_order_wizard_order],
+ 'result': {'type': 'state', 'state': 'end'}
+ }
+ }
+
+sandwich_order_wizard('sandwich.order.wizard')
+
+#
+# This class send a request message to users who don't have their order filled in for this day
+#
+class sandwich_order_recall_wizard(wizard.interface):
+ def _sandwich_order_recall_wizard_send(self, cr, uid, data, context):
+ for user_id in data['form']['user_id'][0][2]:
+ if not pooler.get_pool(cr.dbname).get('sandwich.order.line').search(cr, uid, [('user_id','=',user_id),('order_id','=',data['id'])]):
+ request = pooler.get_pool(cr.dbname).get('res.request')
+ request.create(cr, uid, {
+ 'name' : "Please order your lunch of the day",
+ 'priority' : '0',
+ 'state' : 'active',
+ 'body' : """Hello,
+
+It seems like you have forgotten to order your sandwich (or meal).
+As it will be ordered soon, it seems to be a rather nice idea to complete your
+order for today ASAP. If you do not, you'll probably get the same meal as yesterday...
+
+Thanks,
+
+--
+Tiny ERP
+""",
+ 'act_from' : uid,
+ 'act_to' : user_id,
+ })
+ return {}
+
+ _sandwich_order_recall_wizard_form = '''
+ '''
+
+ _sandwich_order_recall_wizard_fields = {
+ 'user_id': {'string': 'Baaaad users !', 'type': 'many2many', 'relation': 'res.users'},
+ }
+
+ states = {
+ 'init' : {
+ 'actions' : [],
+ 'result' : {'type': 'form', 'arch': _sandwich_order_recall_wizard_form, 'fields': _sandwich_order_recall_wizard_fields, 'state': [('end','Cancel'),('send','Send')]},
+ },
+ 'send' : {
+ 'actions' : [_sandwich_order_recall_wizard_send],
+ 'result' : {'type': 'state', 'state': 'end'},
+ }
+ }
+
+sandwich_order_recall_wizard('sandwich.order.recall.wizard')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/scrum/i18n/fr_FR.po b/addons/scrum/i18n/fr_FR.po
index 2a8a4f6b862..fbb5bec2116 100644
--- a/addons/scrum/i18n/fr_FR.po
+++ b/addons/scrum/i18n/fr_FR.po
@@ -4,168 +4,257 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 13:28+0000\n"
+"PO-Revision-Date: 2008-10-14 07:18+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-14 10:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: scrum
+#: field:scrum.project,members:0
+msgid "Project members"
+msgstr "Membres du projet"
+
+#. module: scrum
+#: field:scrum.task,effective_hours:0
+msgid "Eff. Hours"
+msgstr "Heures Eff."
#. module: scrum
#: view:scrum.product.backlog:0
msgid "Scrum Product backlog"
-msgstr ""
+msgstr "Retard du Produit Scrum"
#. module: scrum
#: field:scrum.meeting,name:0
msgid "Meeting Name"
-msgstr ""
+msgstr "Nom du Rendez-vous"
+
+#. module: scrum
+#: field:scrum.project,warn_customer:0
+msgid "Warn customer"
+msgstr "Avertir le client"
#. module: scrum
#: model:ir.actions.act_window,name:scrum.action_view_task4
#: model:ir.ui.menu,name:scrum.menu_action_view_task4
msgid "My tasks"
-msgstr ""
+msgstr "Mes Tâches"
#. module: scrum
#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
msgid "My opened sprints (Product Owner)"
-msgstr ""
+msgstr "Mes Sprints Ouverts (Directeur de Produit)"
#. module: scrum
#: field:scrum.project,progress_rate:0
+#: field:scrum.task,progress_rate:0
msgid "Progress"
-msgstr ""
+msgstr "Progression"
#. module: scrum
#: field:scrum.project,child_id:0
msgid "Subproject"
-msgstr ""
+msgstr "Sous-projet"
#. module: scrum
#: view:scrum.meeting:0
msgid "What have you accomplished since yesterday ?"
-msgstr ""
+msgstr "Qu'avez vous accompli depuis hier ?"
#. module: scrum
#: view:scrum.meeting:0
msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr ""
+msgstr "Est-ce que l'estimation du Retard du Sprint est correcte ?"
#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr ""
+#: field:scrum.task,history:0
+msgid "Task Details"
+msgstr "Détails de la tâche"
#. module: scrum
#: view:scrum.project:0
msgid "Scrum Projects"
-msgstr ""
+msgstr "Projets Scrum"
#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr ""
+#: field:scrum.project,tax_ids:0
+msgid "Applicable taxes"
+msgstr "Taxes applicables"
#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr ""
+#: field:scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr "Tâches déléguées"
#. module: scrum
#: field:scrum.task,priority:0
msgid "Importance"
-msgstr ""
+msgstr "Importance"
#. module: scrum
#: model:ir.model,name:scrum.model_scrum_task
msgid "Scrum Task"
-msgstr ""
+msgstr "Tâche Scrum"
+
+#. module: scrum
+#: field:scrum.project,tariff:0
+msgid "Sales price"
+msgstr "Prix des ventes"
#. module: scrum
#: model:ir.actions.act_window,name:scrum.dblc_proj
msgid "View project's backlog"
-msgstr ""
+msgstr "Voir le Retard du Projet"
#. module: scrum
#: selection:scrum.task,priority:0
#: selection:scrum.product.backlog,priority:0
msgid "Very urgent"
-msgstr ""
+msgstr "Très urgent"
+
+#. module: scrum
+#: field:scrum.task,start_sequence:0
+msgid "Wait for previous sequences"
+msgstr "Attendre une étape précédente"
#. module: scrum
#: field:scrum.sprint,retrospective:0
msgid "Sprint Retrospective"
-msgstr ""
+msgstr "Retrospective du Sprint"
#. module: scrum
#: field:scrum.sprint,name:0
msgid "Sprint Name"
-msgstr ""
+msgstr "Nom du Sprint"
#. module: scrum
#: field:scrum.project,notes:0
#: field:scrum.task,notes:0
msgid "Notes"
-msgstr ""
+msgstr "Notes"
#. module: scrum
#: model:ir.model,name:scrum.model_scrum_product_backlog
#: field:scrum.task,product_backlog_id:0
msgid "Product Backlog"
-msgstr ""
+msgstr "Retard du Produit"
#. module: scrum
#: field:scrum.task,project_id:0
#: field:scrum.sprint,project_id:0
msgid "Project"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid "If you check this field, the project manager will receive a request each time a task is completed by his team."
-msgstr ""
+msgstr "Projet"
#. module: scrum
#: selection:scrum.project,state:0
#: selection:scrum.task,state:0
msgid "Cancelled"
-msgstr ""
+msgstr "Annulé"
#. module: scrum
#: field:scrum.team,name:0
msgid "Team Name"
-msgstr ""
+msgstr "Nom de l'équipe"
#. module: scrum
#: field:scrum.project,warn_footer:0
msgid "Mail footer"
-msgstr ""
+msgstr "Pied de page du message"
#. module: scrum
#: field:scrum.project,sprint_size:0
msgid "Sprint Days"
-msgstr ""
+msgstr "Jours du Sprint"
#. module: scrum
#: field:scrum.sprint,date_stop:0
msgid "Ending Date"
-msgstr ""
+msgstr "Date de fin"
#. module: scrum
#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
msgid "View sprint Tasks"
-msgstr ""
+msgstr "Voir les Tâches du Sprint"
+
+#. module: scrum
+#: field:scrum.task,invoice_id:0
+msgid "Generated Invoice"
+msgstr "Générer une facture"
#. module: scrum
#: field:scrum.project,category_id:0
msgid "Analytic Account"
-msgstr ""
+msgstr "Compte analytique"
+
+#. module: scrum
+#: field:scrum.project,mode:0
+msgid "Price setting mode"
+msgstr "Mode de calcul du prix"
+
+#. module: scrum
+#: field:scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr "Date limite"
+
+#. module: scrum
+#: field:scrum.project,warn_manager:0
+msgid "Warn manager"
+msgstr "Prévenir le responsable"
+
+#. module: scrum
+#: field:scrum.product.backlog,planned_hours:0
+#: field:scrum.sprint,planned_hours:0
+msgid "Planned Hours"
+msgstr "Heures planifiés"
+
+#. module: scrum
+#: field:scrum.project,name:0
+msgid "Project name"
+msgstr "Nom du projet"
+
+#. module: scrum
+#: field:scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr "Priorité"
+
+#. module: scrum
+#: view:scrum.sprint:0
+msgid "State"
+msgstr "État"
+
+#. module: scrum
+#: field:scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr "Scrum Journalier"
+
+#. module: scrum
+#: field:scrum.task,type:0
+msgid "Type"
+msgstr "Type"
+
+#. module: scrum
+#: field:scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr "Scrum Master"
+
+#. module: scrum
+#: selection:scrum.task,priority:0
+#: selection:scrum.product.backlog,priority:0
+msgid "Medium"
+msgstr "Moyenne"
+
+#. module: scrum
+#: model:ir.ui.menu,name:scrum.next_id_67
+msgid "Scrum"
+msgstr "Scrum"
#. module: scrum
#: model:ir.actions.act_window,name:scrum.action_view_task
@@ -173,136 +262,72 @@ msgstr ""
msgid "All Tasks"
msgstr "Toutes les tâches"
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,planned_hours:0
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "State"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.task,priority:0
-#: selection:scrum.product.backlog,priority:0
-msgid "Medium"
-msgstr ""
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr ""
-
#. module: scrum
#: field:scrum.meeting,question_today:0
msgid "Tasks for today"
-msgstr ""
+msgstr "Tâches pour aujourd'hui"
#. module: scrum
#: field:scrum.meeting,question_yesterday:0
msgid "Tasks since yesterday"
-msgstr ""
+msgstr "Tâches depuis hier"
+
+#. module: scrum
+#: field:scrum.project,pricelist_id:0
+msgid "Pricelist"
+msgstr "Liste de prix"
#. module: scrum
#: field:scrum.project,warn_header:0
msgid "Mail header"
-msgstr ""
+msgstr "Entête du message"
#. module: scrum
-#: field:scrum.project,date_start:0
#: field:scrum.sprint,date_start:0
msgid "Starting Date"
-msgstr ""
+msgstr "Date de début"
#. module: scrum
#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
msgid "Projects"
-msgstr ""
+msgstr "Projets"
#. module: scrum
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue"
#. module: scrum
#: model:ir.actions.act_window,name:scrum.dblc_proj2
msgid "View project's tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr ""
+msgstr "Voir les tâches du projet"
#. module: scrum
#: field:scrum.project,contact_id:0
msgid "Contact"
-msgstr ""
+msgstr "Contact"
#. module: scrum
#: field:scrum.project,tasks:0
+#: view:scrum.task:0
msgid "Scrum Tasks"
-msgstr ""
+msgstr "Tâches Scrum"
#. module: scrum
#: field:scrum.meeting,date:0
msgid "Meeting Date"
-msgstr ""
+msgstr "Date du rendez-vous"
#. module: scrum
#: view:scrum.product.backlog:0
msgid "Tasks"
-msgstr ""
+msgstr "Tâches"
#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr ""
+#: view:scrum.sprint:0
+msgid "Retrospective"
+msgstr "Rétrospective"
#. module: scrum
#: wizard_view:scrum.product.backlog.task.create,init:0
@@ -317,15 +342,15 @@ msgid "Is Scrum"
msgstr ""
#. module: scrum
-#: selection:scrum.task,priority:0
-#: selection:scrum.product.backlog,priority:0
-msgid "Urgent"
-msgstr ""
+#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr "Retards Brouillon"
#. module: scrum
#: field:scrum.sprint,backlog_ids:0
msgid "Sprint Backlog"
-msgstr ""
+msgstr "Retard du Sprint"
#. module: scrum
#: model:ir.actions.act_window,name:scrum.action_view_task6
@@ -336,70 +361,75 @@ msgstr "Tâches ouvertes"
#. module: scrum
#: field:scrum.meeting,question_blocks:0
msgid "Blocks encountered"
-msgstr ""
+msgstr "Blocages rencontrés"
#. module: scrum
#: view:scrum.meeting:0
msgid "Optionnal Info"
-msgstr ""
+msgstr "Info optionelle"
+
+#. module: scrum
+#: field:scrum.task,billable:0
+msgid "To be invoiced"
+msgstr "A facturer"
#. module: scrum
#: model:ir.model,name:scrum.model_scrum_sprint
#: view:scrum.meeting:0
#: view:scrum.sprint:0
msgid "Scrum Sprint"
-msgstr ""
+msgstr "Sprint Scrum"
#. module: scrum
#: view:scrum.sprint:0
msgid "Review"
-msgstr ""
+msgstr "Critique"
#. module: scrum
#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
msgid "My opened sprints (Scrum Master)"
-msgstr ""
+msgstr "Mes Sprints Ouverts (Maître Scrum)"
+
+#. module: scrum
+#: selection:scrum.project,mode:0
+msgid "By Task"
+msgstr "Par tâche"
#. module: scrum
#: field:scrum.product.backlog,note:0
msgid "Note"
-msgstr ""
+msgstr "Note"
#. module: scrum
#: selection:scrum.task,state:0
#: selection:scrum.product.backlog,state:0
#: selection:scrum.sprint,state:0
msgid "Draft"
-msgstr ""
+msgstr "Brouillon"
#. module: scrum
#: selection:scrum.task,priority:0
#: selection:scrum.product.backlog,priority:0
msgid "Low"
-msgstr ""
+msgstr "Faible"
#. module: scrum
#: model:ir.actions.act_window,name:scrum.action_view_task5
#: model:ir.ui.menu,name:scrum.menu_tasks_yours
msgid "My opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr ""
+msgstr "Mes Tâches Ouvertes"
#. module: scrum
#: selection:scrum.project,state:0
#: selection:scrum.task,state:0
msgid "Pending"
-msgstr ""
+msgstr "En attente"
#. module: scrum
#: view:scrum.meeting:0
msgid "Is there anything blocking you ?"
-msgstr ""
+msgstr "Est-ce que quelque chose vous bloque ?"
#. module: scrum
#: field:scrum.project,state:0
@@ -407,51 +437,53 @@ msgstr ""
#: field:scrum.product.backlog,state:0
#: field:scrum.sprint,state:0
msgid "Status"
-msgstr ""
+msgstr "État"
#. module: scrum
#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
msgid "Opened Sprints"
-msgstr ""
+msgstr "Sprints Ouverts"
#. module: scrum
-#: field:scrum.project,name:0
-msgid "Project Name"
+#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
+msgid "scrum.meeting.form"
msgstr ""
#. module: scrum
#: field:scrum.project,product_owner_id:0
#: field:scrum.sprint,product_owner_id:0
msgid "Product Owner"
-msgstr ""
+msgstr "Directeur de Produit"
#. module: scrum
#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
msgid "My Sprints (Scrum Master)"
-msgstr ""
+msgstr "Mes Sprints (Maître Scrum)"
#. module: scrum
#: view:scrum.product.backlog:0
msgid "Product backlog"
-msgstr ""
+msgstr "Retard du Produit"
#. module: scrum
#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
msgid "Backlogs"
-msgstr ""
+msgstr "Retards"
#. module: scrum
#: field:scrum.product.backlog,user_id:0
msgid "User"
-msgstr ""
+msgstr "Utilisateur"
#. module: scrum
-#: field:scrum.task,date_start:0
-msgid "Date"
-msgstr ""
+#: field:scrum.project,active:0
+#: field:scrum.task,active:0
+#: field:scrum.product.backlog,active:0
+msgid "Active"
+msgstr "Actif"
#. module: scrum
#: field:scrum.task,timebox_id:0
@@ -462,50 +494,54 @@ msgstr ""
#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
msgid "Draft Sprints"
-msgstr ""
+msgstr "Sprints Brouillon"
#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr ""
+#: field:scrum.product.backlog,name:0
+msgid "Feature"
+msgstr "Fonctionnalité"
#. module: scrum
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-#: field:scrum.product.backlog,active:0
-msgid "Active"
-msgstr ""
+#: selection:scrum.task,priority:0
+#: selection:scrum.product.backlog,priority:0
+msgid "Urgent"
+msgstr "Urgent"
+
+#. module: scrum
+#: field:scrum.task,date_start:0
+msgid "Date"
+msgstr "Date"
#. module: scrum
#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
msgid "View sprint backlog"
-msgstr ""
+msgstr "Voir les retards du sprint"
#. module: scrum
#: field:scrum.task,date_close:0
msgid "Date Closed"
-msgstr ""
+msgstr "Date de fin"
#. module: scrum
#: field:scrum.task,user_id:0
msgid "Assigned to"
-msgstr ""
+msgstr "Assigné à"
#. module: scrum
#: field:scrum.meeting,question_backlog:0
msgid "Backlog Accurate"
-msgstr ""
+msgstr "Retard Correct"
#. module: scrum
#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
msgid "My Sprints (Product Owner)"
-msgstr ""
+msgstr "Mes Sprints (Directeur de Produit)"
#. module: scrum
#: field:scrum.task,name:0
msgid "Task summary"
-msgstr ""
+msgstr "Résumé de la tâche"
#. module: scrum
#: selection:scrum.project,state:0
@@ -513,25 +549,20 @@ msgstr ""
#: selection:scrum.product.backlog,state:0
#: selection:scrum.sprint,state:0
msgid "Done"
-msgstr ""
+msgstr "Terminé"
#. module: scrum
#: wizard_button:scrum.product.backlog.task.create,init,end:0
msgid "Cancel"
msgstr "Annuler"
-#. module: scrum
-#: help:scrum.project,category_id:0
-msgid "Link this project to an analytic account if you need financial management on projects. It ables to connect projects with budgets, plannings, costs and revenues analysis, timesheet on projects, etc."
-msgstr ""
-
#. module: scrum
#: selection:scrum.project,state:0
#: selection:scrum.task,state:0
#: selection:scrum.product.backlog,state:0
#: selection:scrum.sprint,state:0
msgid "Open"
-msgstr ""
+msgstr "Ouvert"
#. module: scrum
#: field:scrum.product.backlog,effective_hours:0
@@ -539,182 +570,182 @@ msgstr ""
#: view:scrum.product.backlog:0
#: view:scrum.project:0
#: view:scrum.sprint:0
+#: view:scrum.task:0
msgid "Effective hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr ""
+msgstr "Heures effectives"
#. module: scrum
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
#. module: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr ""
+#: field:scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr "Tâche parente"
#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
+#: field:scrum.project,date_start:0
+msgid "Project started on"
+msgstr "Projet démarré le"
#. module: scrum
#: selection:scrum.task,priority:0
#: selection:scrum.product.backlog,priority:0
msgid "Very Low"
-msgstr ""
+msgstr "Très basse"
#. module: scrum
#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
msgid "Sprints Done"
-msgstr ""
+msgstr "Sprints Terminés"
+
+#. module: scrum
+#: field:scrum.project,timesheet_id:0
+msgid "Working hours"
+msgstr "Heures travaillées"
#. module: scrum
#: field:scrum.project,planned_hours:0
#: view:scrum.product.backlog:0
#: view:scrum.project:0
#: view:scrum.sprint:0
+#: view:scrum.task:0
msgid "Planned hours"
-msgstr ""
+msgstr "Heures planifiées"
#. module: scrum
#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
msgid "Edit Projects"
-msgstr ""
+msgstr "Éditer les Projets"
#. module: scrum
#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
#: view:scrum.meeting:0
msgid "Scrum Meeting"
-msgstr ""
+msgstr "Rendez-vous Scrum"
#. module: scrum
#: field:scrum.task,description:0
msgid "Description"
-msgstr ""
+msgstr "Description"
#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr ""
+#: field:scrum.project,date_end:0
+msgid "Project should end on"
+msgstr "Date de fin de projet"
#. module: scrum
#: view:scrum.sprint:0
msgid "Daily Meetings"
-msgstr ""
+msgstr "Rendez-vous Journaliers"
#. module: scrum
#: field:scrum.task,work_ids:0
msgid "Work done"
-msgstr ""
+msgstr "Travail effectué"
#. module: scrum
#: view:scrum.meeting:0
msgid "What are you working on today ?"
-msgstr ""
+msgstr "Sur quoi travaillez vous aujourd'hui ?"
#. module: scrum
#: field:scrum.project,effective_hours:0
msgid "Hours spent"
-msgstr ""
+msgstr "Heures travaillées"
#. module: scrum
+#: field:scrum.task,progress:0
#: field:scrum.product.backlog,progress:0
#: field:scrum.sprint,progress:0
msgid "Progress (0-100)"
-msgstr ""
+msgstr "Avancement (0-100)"
#. module: scrum
#: model:ir.model,name:scrum.model_scrum_team
msgid "Scrum Team"
-msgstr ""
+msgstr "Équipe Scrum"
#. module: scrum
#: model:ir.model,name:scrum.model_scrum_project
#: field:scrum.product.backlog,project_id:0
msgid "Scrum Project"
-msgstr ""
+msgstr "Projet Scrum"
#. module: scrum
#: field:scrum.project,parent_id:0
msgid "Parent project"
-msgstr ""
+msgstr "Project Parent"
#. module: scrum
#: view:scrum.sprint:0
msgid "Sprint Info"
-msgstr ""
+msgstr "Info sur le Sprint"
#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr ""
+#: field:scrum.project,partner_id:0
+#: field:scrum.task,partner_id:0
+msgid "Customer"
+msgstr "Client"
+
+#. module: scrum
+#: field:scrum.task,planned_hours:0
+msgid "Plan. hours"
+msgstr "Heures Plan."
#. module: scrum
#: field:scrum.product.backlog,tasks_id:0
msgid "Tasks Details"
-msgstr ""
+msgstr "Détails des Tâches"
#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr ""
+#: selection:scrum.project,mode:0
+msgid "By Effective Hour"
+msgstr "Par Heure Effective"
#. module: scrum
#: field:scrum.task,context_id:0
msgid "Context"
-msgstr ""
+msgstr "Contexte"
#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr ""
+#: selection:scrum.project,mode:0
+msgid "By Hour"
+msgstr "Par Heure"
#. module: scrum
#: field:scrum.team,users_id:0
msgid "Users"
-msgstr ""
+msgstr "Utilisateurs"
#. module: scrum
#: field:scrum.project,priority:0
#: field:scrum.task,sequence:0
#: field:scrum.product.backlog,sequence:0
msgid "Sequence"
-msgstr ""
+msgstr "Séquence"
#. module: scrum
#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
msgid "Opened Backlogs"
-msgstr ""
+msgstr "Retards Ouverts"
#. module: scrum
#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
msgid "Created tasks"
-msgstr ""
+msgstr "Tâches Créées"
#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr ""
+#: field:scrum.sprint,review:0
+msgid "Sprint Review"
+msgstr "Critique du Sprint"
#. module: scrum
#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
@@ -727,15 +758,9 @@ msgstr "Attribué à"
#: field:scrum.product.backlog,sprint_id:0
#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
msgid "Sprint"
-msgstr ""
+msgstr "Sprint"
#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
+#: field:scrum.project,manager:0
+msgid "Project manager"
+msgstr "Gestionnaire de projet"
diff --git a/addons/scrum/security/ir.model.access.csv b/addons/scrum/security/ir.model.access.csv
index b51dccdc51a..2c139b10b26 100644
--- a/addons/scrum/security/ir.model.access.csv
+++ b/addons/scrum/security/ir.model.access.csv
@@ -1,9 +1,11 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_scrum_team,scrum.team,model_scrum_team,project.group_project_user,1,1,1,1
-access_scrum_project,scrum.project,model_scrum_project,project.group_project_user,1,1,1,1
-access_scrum_sprint,scrum.sprint,model_scrum_sprint,project.group_project_user,1,,,
-access_scrum_product_backlog,scrum.product.backlog,model_scrum_product_backlog,project.group_project_user,1,1,1,1
-access_scrum_task,scrum.task,model_scrum_task,project.group_project_user,1,1,1,1
-access_scrum_meeting,scrum.meeting,model_scrum_meeting,project.group_project_user,1,,,
-access_scrum_meeting_manager,scrum.meeting.manager,model_scrum_meeting,project.group_project_manager,1,1,1,1
-access_scrum_sprint_manager,scrum.sprint.manager,model_scrum_sprint,project.group_project_manager,1,1,1,1
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_scrum_team","scrum.team","model_scrum_team","project.group_project_user",1,1,1,1
+"access_scrum_project","scrum.project","model_scrum_project","project.group_project_user",1,1,1,1
+"access_scrum_sprint","scrum.sprint","model_scrum_sprint","project.group_project_user",1,,,
+"access_scrum_product_backlog","scrum.product.backlog","model_scrum_product_backlog","project.group_project_user",1,1,1,1
+"access_scrum_task","scrum.task","model_scrum_task","project.group_project_user",1,1,1,1
+"access_scrum_meeting","scrum.meeting","model_scrum_meeting","project.group_project_user",1,,,
+"access_scrum_meeting_manager","scrum.meeting.manager","model_scrum_meeting","project.group_project_manager",1,1,1,1
+"access_scrum_sprint_manager","scrum.sprint.manager","model_scrum_sprint","project.group_project_manager",1,1,1,1
+"access_scrum_product_backlog_manager","scrum.product.backlog manager","model_scrum_product_backlog","project.group_project_manager",1,1,1,1
+"access_scrum_project_manager","scrum.project manager","model_scrum_project","project.group_project_manager",1,1,1,1
diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py
index e80312a2097..fbcb5e32b6b 100644
--- a/addons/stock/__terp__.py
+++ b/addons/stock/__terp__.py
@@ -36,8 +36,6 @@
"init_xml" : [],
"demo_xml" : ["stock_demo.xml"],
"update_xml" : [
- "security/stock_security.xml",
- "security/ir.model.access.csv",
"stock_workflow.xml",
"stock_data.xml",
"stock_incoterms.xml",
@@ -49,6 +47,8 @@
"product_view.xml",
"partner_view.xml",
"report_stock_view.xml",
+ "security/stock_security.xml",
+ "security/ir.model.access.csv",
],
"active": False,
"installable": True
diff --git a/addons/stock/i18n/fr_FR.po b/addons/stock/i18n/fr_FR.po
index ac591482480..48bb559286d 100644
--- a/addons/stock/i18n/fr_FR.po
+++ b/addons/stock/i18n/fr_FR.po
@@ -1,24 +1,26 @@
-# Translation of OpenERP Server.
-# This file containt the translation of the following modules:
-# * stock
+# French translation for openobject-addons
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2008.
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 13:21+0000\n"
+"PO-Revision-Date: 2008-10-14 09:37+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: French \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-14 09:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
-#: rml:stock.picking.list:0
+#: xsl:stock.picking.list:0
msgid "Shipping Address:"
-msgstr ""
+msgstr "Adresse de livraison"
#. module: stock
#: field:stock.production.lot.revision,author_id:0
@@ -33,69 +35,54 @@ msgstr "LIFO"
#. module: stock
#: selection:stock.picking,move_type:0
msgid "All at once"
-msgstr "Tout d'un coup"
+msgstr "Tout en une fois"
#. module: stock
#: field:stock.location,chained_location_id:0
msgid "Chained Location If Fixed"
-msgstr ""
+msgstr "Emplacement Lié si Fixe"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree9
#: model:ir.ui.menu,name:stock.menu_action_picking_tree9
msgid "Draft Internal Packings"
-msgstr ""
+msgstr "Colisages Internes Brouillons"
#. module: stock
#: selection:stock.picking,invoice_state:0
msgid "Not from Packing"
-msgstr "Pas d'un colisage"
-
-#. module: stock
-#: model:stock.location,name:stock.stock_location_15
-msgid "Sub Products"
-msgstr ""
-
-#. module: stock
-#: rml:stock.picking.list:0
-msgid "Concerns"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Manual Operation"
-msgstr ""
-
-#. module: stock
-#: selection:stock.picking,invoice_state:0
-msgid "Invoiced"
-msgstr "Facturé"
-
-#. module: stock
-#: model:ir.ui.menu,name:stock.menu_stock_root
-msgid "Stock Management"
-msgstr ""
+msgstr "pas d'un colisage"
#. module: stock
#: view:stock.location:0
msgid "Chained Locations"
-msgstr ""
+msgstr "Emplacements Liés"
+
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+msgid "Invoiced"
+msgstr "Facturer"
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_root
+msgid "Stock Management"
+msgstr "Gestion des stocks"
#. module: stock
#: model:ir.actions.report.xml,name:stock.report_product_history
msgid "Future stock forecast"
-msgstr "Stocks prévisionnels"
+msgstr "Stock Prévisionnel"
#. module: stock
#: selection:stock.picking,type:0
msgid "Delivery"
-msgstr ""
+msgstr "Livraison"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_inventory_line_form
#: model:ir.ui.menu,name:stock.menu_action_inventory_line_form
msgid "Inventory Lines"
-msgstr ""
+msgstr "Lignes d'inventaires"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree3
@@ -103,29 +90,24 @@ msgstr ""
#: model:ir.ui.menu,name:stock.menu_action_picking_tree3
#: model:ir.ui.menu,name:stock.menu_action_picking_tree8
msgid "Confirmed Packings Waiting Assignation"
-msgstr ""
+msgstr "Colis Confirmés en attente d'Assignation"
#. module: stock
#: view:stock.tracking:0
msgid "Tracking/Serial"
-msgstr "Num. suivi/série"
-
-#. module: stock
-#: model:stock.location,name:stock.stock_location_workshop
-msgid "Workshop"
-msgstr ""
+msgstr "Tracer N° Série"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_tracking_form
#: model:ir.ui.menu,name:stock.menu_action_tracking_form
msgid "Tracking Lots"
-msgstr ""
+msgstr "Tracer les lots"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_inventory_form
#: model:ir.ui.menu,name:stock.menu_action_inventory_form
msgid "Physical Inventory"
-msgstr ""
+msgstr "Inventaire physique"
#. module: stock
#: wizard_view:stock.move.track,init:0
@@ -135,23 +117,18 @@ msgstr "Tracer un mouvement"
#. module: stock
#: view:stock.inventory:0
msgid "Lot Inventory"
-msgstr "Inventaire de lot"
+msgstr "Inventaire du Lot"
#. module: stock
#: field:stock.inventory.line,product_uom:0
#: field:stock.move,product_uom:0
msgid "Product UOM"
-msgstr "UDM produit"
-
-#. module: stock
-#: rml:stock.picking.list:0
-msgid "Customer Ref."
-msgstr ""
+msgstr "Unité principale produit"
#. module: stock
#: model:stock.location,name:stock.stock_location_locations_partner
msgid "Partner Locations"
-msgstr ""
+msgstr "Emplacements partenaire"
#. module: stock
#: view:stock.picking:0
@@ -161,39 +138,34 @@ msgstr "Valider"
#. module: stock
#: view:stock.picking:0
msgid "Input Packing List"
-msgstr ""
+msgstr "Liste des Colisages Entrants"
#. module: stock
#: view:stock.production.lot.revision:0
msgid "Production Lot Revisions"
-msgstr "Révisions du lot de fabrication"
+msgstr "Révisions des Lots de Production"
#. module: stock
#: xsl:stock.location.overview:0
#: xsl:stock.location.overview.all:0
msgid "UoM"
-msgstr "UM"
-
-#. module: stock
-#: model:stock.location,name:stock.stock_location_4
-msgid "Maxtor Suppliers"
-msgstr ""
+msgstr "Unité principale"
#. module: stock
#: model:ir.actions.wizard,name:stock.return_picking
msgid "Return packing"
-msgstr "Retour colis"
+msgstr "Retourner le Colisage"
#. module: stock
#: field:product.category,property_stock_journal:0
msgid "Stock journal"
-msgstr "Journal de stock"
+msgstr "Journal des stocks"
#. module: stock
-#: rml:stock.picking.list:0
+#: xsl:stock.picking.list:0
#: field:stock.tracking,name:0
msgid "Tracking"
-msgstr "Numéro de suivi"
+msgstr "Suivi"
#. module: stock
#: wizard_button:stock.picking.make,init,make:0
@@ -202,15 +174,17 @@ msgid "Ok"
msgstr "Ok"
#. module: stock
-#: help:product.template,property_stock_account_input:0
-msgid "This account will be used, instead of the default one, to value input stock"
-msgstr "Ce compte sera utilisé , au lieu de celui par défaut, pour valoriser le stock d'entrée"
+#: view:stock.picking:0
+msgid "Cancel Assignation"
+msgstr "Annuler assignation"
#. module: stock
-#, python-format
-#: code:addons/stock/stock.py:0
-msgid "UserError"
+#: help:product.template,property_stock_account_input:0
+msgid ""
+"This account will be used, instead of the default one, to value input stock"
msgstr ""
+"Ce compte sera utilisé, à la place de celui par défaut, pour valoriser le "
+"stock entrant"
#. module: stock
#: view:stock.tracking:0
@@ -224,27 +198,17 @@ msgstr "Numéro de suivi"
msgid "Notes"
msgstr "Notes"
-#. module: stock
-#: field:stock.picking,max_date:0
-msgid "Max. Date"
-msgstr ""
-
#. module: stock
#: field:stock.picking,move_lines:0
#: field:stock.picking.move.wizard,move_ids:0
msgid "Move lines"
-msgstr "Mouvements créés"
-
-#. module: stock
-#: model:stock.location,name:stock.stock_location_8
-msgid "Non European Customers"
-msgstr ""
+msgstr "Lignes de mouvements"
#. module: stock
#: xsl:stock.location.overview:0
#: xsl:stock.location.overview.all:0
msgid "Value"
-msgstr "Montant"
+msgstr "Valeur"
#. module: stock
#: model:ir.actions.report.xml,name:stock.report_picking_list
@@ -253,34 +217,29 @@ msgstr "Montant"
#: field:stock.picking.move.wizard,picking_id:0
#: view:stock.picking:0
msgid "Packing list"
-msgstr "Liste de colisage"
-
-#. module: stock
-#, python-format
-#: code:addons/stock/stock.py:0
-#: code:addons/stock/wizard/wizard_track_line.py:0
-msgid "Error!"
-msgstr ""
+msgstr "Liste des Colisages"
#. module: stock
#: xsl:stock.location.overview:0
#: xsl:stock.location.overview.all:0
msgid "Amount"
-msgstr "Quantité"
+msgstr "Montant"
#. module: stock
#: help:stock.move,prodlot_id:0
msgid "Production lot is used to put a serial number on the production"
-msgstr "Le lot de production est utilisée pour mettre un numéro de série sur cette production"
+msgstr ""
+"Le lot de production est utilisé pour mettre un numéro de série lors de la "
+"production"
#. module: stock
#: model:ir.actions.act_window,name:stock.act_product_location_open
msgid "Products"
-msgstr "Produit"
+msgstr "Produits"
#. module: stock
-#: model:stock.location,name:stock.stock_location_components
-msgid "Components"
+#: model:ir.actions.wizard,name:stock.partial_picking
+msgid "Partial picking"
msgstr ""
#. module: stock
@@ -296,35 +255,25 @@ msgstr "Méthode de livraison"
#. module: stock
#: field:stock.location,chained_location_type:0
msgid "Chained Location Type"
-msgstr ""
+msgstr "Type d'Emplacement Lié"
#. module: stock
#: field:stock.picking,origin:0
msgid "Origin"
msgstr "Origine"
-#. module: stock
-#: model:ir.actions.wizard,name:stock.partial_picking
-msgid "Partial packing"
-msgstr ""
-
-#. module: stock
-#: field:stock.picking,min_date:0
-msgid "Min. Date"
-msgstr ""
-
-#. module: stock
-#: help:stock.move,tracking_id:0
-msgid "Tracking lot is the code that will be put on the logistic unit/pallet"
-msgstr "Le lot de suivi est le code qui sera inscrit sur l'unité logistique/palette"
-
#. module: stock
#: model:ir.ui.menu,name:stock.menu_stock_configuration
msgid "Configuration"
msgstr "Configuration"
#. module: stock
-#: field:stock.picking,name:0
+#: help:stock.move,tracking_id:0
+msgid "Tracking lot is the code that will be put on the logistic unit/pallet"
+msgstr ""
+"Le lot de suivi est le code qui sera inscrit sur l'unité/pallette logistique"
+
+#. module: stock
#: field:stock.production.lot,ref:0
#: field:stock.tracking,serial:0
msgid "Reference"
@@ -335,21 +284,16 @@ msgstr "Référence"
msgid "Stock Move"
msgstr "Mouvement de stock"
-#. module: stock
-#: model:stock.location,name:stock.stock_location_3
-msgid "IT Suppliers"
-msgstr ""
-
#. module: stock
#: selection:stock.picking,type:0
msgid "Getting Goods"
-msgstr "Réception de marchandises"
+msgstr "Réception de marchandise"
#. module: stock
#: model:ir.actions.act_window,name:stock.act_stock_picking_move_wizard
#: view:stock.picking:0
msgid "Fill From Unreceived Products"
-msgstr ""
+msgstr "Remplir à partir des Produits Non Reçus"
#. module: stock
#: selection:stock.picking,type:0
@@ -359,46 +303,51 @@ msgstr "Interne"
#. module: stock
#: wizard_field:stock.invoice_onshipping,init,group:0
msgid "Group by partner"
-msgstr "Groupes par partenaire"
+msgstr "Grouper par partenaire"
#. module: stock
#: field:stock.move,move_dest_id:0
msgid "Dest. Move"
-msgstr "Mouvement dest."
+msgstr "Emplacement de Dest."
#. module: stock
#: field:stock.picking,address_id:0
msgid "Partner"
-msgstr "Déplacer vers l'adresse"
+msgstr "Partenaire"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree_delivery
#: model:ir.ui.menu,name:stock.menu_action_picking_tree_delivery
msgid "Delivery Orders"
-msgstr ""
+msgstr "Ordre de livraisons"
#. module: stock
#: field:stock.move,move_history_ids:0
#: field:stock.move,move_history_ids2:0
msgid "Move History"
-msgstr "Historique mouvement"
+msgstr "Historique du mouvement"
#. module: stock
#: help:res.partner,property_stock_customer:0
-msgid "This stock location will be used, instead of the default one, as the destination location for goods you send to this partner"
-msgstr "Cette location de stock va etre utilisée au lieu de celle par défaut"
+msgid ""
+"This stock location will be used, instead of the default one, as the "
+"destination location for goods you send to this partner"
+msgstr ""
+"Cette emplacement de stock sera utilisée au lieu de celui par défaut en tant "
+"que l'emplacement de destination pour les biens que vous envoyez à ce "
+"partenaire."
#. module: stock
#: model:ir.model,name:stock.model_stock_production_lot
#: field:stock.move,prodlot_id:0
#: field:stock.production.lot.revision,lot_id:0
msgid "Production lot"
-msgstr "Lot de fabrication"
+msgstr "Lot de production"
#. module: stock
-#: model:stock.location,name:stock.stock_location_suppliers
-msgid "Suppliers"
-msgstr ""
+#: field:stock.picking,name:0
+msgid "Packing name"
+msgstr "Nom du Colis"
#. module: stock
#: view:stock.move:0
@@ -406,25 +355,20 @@ msgstr ""
msgid "Confirm"
msgstr "Confirmer"
-#. module: stock
-#: view:stock.picking:0
-msgid "Invoice Control"
-msgstr ""
-
#. module: stock
#: model:ir.model,name:stock.model_stock_production_lot_revision
msgid "Production lot revisions"
-msgstr "Révisions du lot de fabrication"
+msgstr "Révisions des lots de productions"
#. module: stock
#: model:stock.location,name:stock.location_inventory
msgid "Inventory loss"
-msgstr ""
+msgstr "Casse"
#. module: stock
#: selection:stock.location,usage:0
msgid "Internal Location"
-msgstr "Emplacement interne\\""
+msgstr "Emplacement interne"
#. module: stock
#: selection:stock.location,allocation_method:0
@@ -435,7 +379,7 @@ msgstr "FIFO"
#: model:ir.actions.act_window,name:stock.action_picking_tree2_delivery
#: model:ir.ui.menu,name:stock.menu_picking_waiting_delivery
msgid "Delivery Orders to Process"
-msgstr ""
+msgstr "Bordereaux de livraison à Traiter"
#. module: stock
#: field:stock.move,priority:0
@@ -443,29 +387,26 @@ msgid "Priority"
msgstr "Priorité"
#. module: stock
-#: selection:stock.move,state:0
-msgid "cancel"
-msgstr "Annulé"
-
-#. module: stock
-#: selection:stock.move,state:0
-#: selection:stock.picking,state:0
-msgid "Waiting"
-msgstr "En attente"
+#: xsl:stock.picking.list:0
+msgid "State"
+msgstr "État"
#. module: stock
#: rml:lot.location:0
-#: rml:stock.picking.list:0
+#: xsl:stock.picking.list:0
#: model:ir.model,name:stock.model_stock_location
#: field:stock.inventory.line,location_id:0
#: field:stock.picking,location_id:0
msgid "Location"
-msgstr "Localisation"
+msgstr "Emplacement"
#. module: stock
#: help:product.template,property_stock_account_output:0
-msgid "This account will be used, instead of the default one, to value output stock"
-msgstr "Ce compte sera utilisé , au lieu de celui par défaut, pour valoriser le stock de sortie"
+msgid ""
+"This account will be used, instead of the default one, to value output stock"
+msgstr ""
+"Ce compte sera utilisé, au lieu de celui par défaut, pour la valeur du stock "
+"de sortie"
#. module: stock
#: model:ir.model,name:stock.model_stock_warehouse
@@ -479,9 +420,9 @@ msgid "Lots by location"
msgstr "Lots par emplacement"
#. module: stock
-#: wizard_button:stock.partial_picking,init,split:0
-msgid "Make Picking"
-msgstr ""
+#: xsl:stock.picking.list:0
+msgid "Qty"
+msgstr "Qté"
#. module: stock
#: wizard_field:stock.invoice_onshipping,init,type:0
@@ -491,61 +432,55 @@ msgstr "Type"
#. module: stock
#: view:stock.move:0
msgid "UOM"
-msgstr "UDM"
+msgstr "Unité principale"
#. module: stock
-#: model:stock.location,name:stock.stock_location_5
-msgid "Generic IT Suppliers"
+#: field:stock.location,chained_auto_packing:0
+msgid "Chained Auto-Packing"
msgstr ""
#. module: stock
#: view:stock.move:0
msgid "Make Parcel"
-msgstr "Faire le colis"
+msgstr "Créer un coli"
#. module: stock
#: model:stock.location,name:stock.location_procurement
msgid "Procurements"
-msgstr ""
+msgstr "Réapprovisionnement"
#. module: stock
#: selection:stock.location,chained_location_type:0
msgid "Fixed Location"
-msgstr ""
+msgstr "Emplacement fixe"
#. module: stock
-#: wizard_view:stock.partial_picking,end2:0
-msgid "Packing result"
-msgstr ""
+#: view:stock.picking:0
+msgid "Cancel assignation"
+msgstr "Annuler l'assignation"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_location_tree
+#: model:ir.ui.menu,name:stock.menu_action_location_tree
+msgid "Locations Structure"
+msgstr "Structure des emplacements"
#. module: stock
#: wizard_button:stock.invoice_onshipping,init,create_invoice:0
#: model:ir.actions.wizard,name:stock.wizard_invoice_onshipping
msgid "Create invoice"
-msgstr "Créer la facture"
+msgstr "Créer une facture"
#. module: stock
#: field:res.partner,property_stock_customer:0
#: selection:stock.location,usage:0
msgid "Customer Location"
-msgstr "Stockage client"
+msgstr "Emplacement Client"
#. module: stock
#: view:stock.location:0
msgid "Stock location tree"
-msgstr "Arbre de localisation de stock"
-
-#. module: stock
-#, python-format
-#: code:addons/stock/stock.py:0
-msgid "You can only delete draft moves."
-msgstr ""
-
-#. module: stock
-#, python-format
-#: code:addons/stock/wizard/wizard_track_line.py:0
-msgid "No production sequence defined"
-msgstr ""
+msgstr "Arbre des Emplacements de Stock"
#. module: stock
#: field:stock.production.lot.revision,date:0
@@ -565,54 +500,39 @@ msgstr "Informations générales"
#. module: stock
#: selection:stock.location,chained_location_type:0
msgid "None"
-msgstr ""
+msgstr "Aucun"
#. module: stock
#: view:product.category:0
msgid "Accounting Stock Properties"
-msgstr ""
+msgstr "Propriété du compte de stock"
#. module: stock
#: model:ir.actions.wizard,name:stock.action4
#: model:ir.actions.wizard,name:stock.action_lot2
msgid "Downstream traceability"
-msgstr "Traçabilité aval"
-
-#. module: stock
-#: view:res.partner:0
-msgid "Sales & Purchases"
-msgstr ""
+msgstr "Traçabilté aval"
#. module: stock
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue"
#. module: stock
-#: model:stock.location,name:stock.stock_location_14
-msgid "Finished products"
-msgstr ""
-
-#. module: stock
-#: field:stock.production.lot,revisions:0
-msgid "Revisions"
-msgstr "Révisions"
-
-#. module: stock
-#: model:stock.location,name:stock.stock_location_customers
-msgid "Customers"
-msgstr ""
+#: field:stock.location,usage:0
+msgid "Location type"
+msgstr "Type d'emplacement"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree
#: model:ir.ui.menu,name:stock.menu_action_picking_tree
msgid "Sending Products"
-msgstr ""
+msgstr "Livraison de Marchandises"
#. module: stock
#: selection:stock.location,allocation_method:0
msgid "Nearest"
-msgstr "Plus proche"
+msgstr "Le plus proche"
#. module: stock
#: selection:stock.location,usage:0
@@ -622,7 +542,7 @@ msgstr "Approvisionnement"
#. module: stock
#: field:stock.location,location_id:0
msgid "Parent Location"
-msgstr "Emplacement Parent\\""
+msgstr "Emplacement parent"
#. module: stock
#: field:stock.inventory,date:0
@@ -630,71 +550,60 @@ msgstr "Emplacement Parent\\""
#: field:stock.production.lot,date:0
#: field:stock.tracking,date:0
msgid "Date create"
-msgstr "Date création"
+msgstr "Date de création"
#. module: stock
-#: view:stock.picking:0
-msgid "Cancel assignation"
-msgstr "Annuler assignation"
+#: xsl:stock.picking.list:0
+msgid "PACKINGLIST"
+msgstr ""
#. module: stock
#: model:ir.model,name:stock.model_stock_tracking
msgid "Stock Tracking Lots"
-msgstr "Numéro de suivi"
+msgstr ""
#. module: stock
#: model:stock.location,name:stock.location_production
msgid "Default Production"
-msgstr ""
+msgstr "Prodcution par défaut"
#. module: stock
#: field:res.partner,property_stock_supplier:0
#: selection:stock.location,usage:0
msgid "Supplier Location"
-msgstr "Stockage fournisseur"
+msgstr "Emplacement fournisseur"
#. module: stock
#: view:stock.picking:0
msgid "Force Assignation"
-msgstr "Forcer l'assignation"
-
-#. module: stock
-#: view:stock.move:0
-msgid "Moves"
-msgstr "Mouvements"
+msgstr "Forcer assignation"
#. module: stock
#: field:stock.move,auto_validate:0
msgid "Auto Validate"
-msgstr ""
+msgstr "Validation Automatique"
#. module: stock
#: model:stock.location,name:stock.stock_location_company
msgid "Tiny sprl"
-msgstr ""
-
-#. module: stock
-#: field:stock.location,chained_auto_packing:0
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr ""
+msgstr "Tiny sprl"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree4
#: model:ir.ui.menu,name:stock.menu_action_picking_tree4
msgid "Getting Products"
-msgstr ""
+msgstr "Réception de Marchandises"
#. module: stock
#: field:stock.move,location_dest_id:0
#: field:stock.picking,location_dest_id:0
msgid "Dest. Location"
-msgstr "Emplacement dest.\\""
+msgstr "Emplacement de Dest."
#. module: stock
#: field:stock.move,product_packaging:0
msgid "Packaging"
-msgstr "Code UL"
+msgstr "Empaquetage"
#. module: stock
#: selection:stock.move,priority:0
@@ -704,12 +613,13 @@ msgstr "Urgent"
#. module: stock
#: help:product.category,property_stock_account_input_categ:0
msgid "This account will be used to value the input stock"
-msgstr "Ce compte sera utilisé pour valoriser les entrées de marchandises"
+msgstr "Ce compte sera utilisé pour mettre la valeur de l'entrée de stock"
#. module: stock
+#: xsl:stock.picking.list:0
#: field:stock.production.lot,name:0
msgid "Serial"
-msgstr "Numéro de série"
+msgstr "Numéro de Série"
#. module: stock
#: field:stock.inventory,inventory_line_id:0
@@ -723,27 +633,38 @@ msgstr "Inventaires"
#: view:stock.move:0
#: view:stock.picking:0
msgid "Stock Moves"
-msgstr ""
+msgstr "Mouvements de stocks"
#. module: stock
#: field:stock.move,date:0
msgid "Date Created"
-msgstr "Date création"
+msgstr "Date de création"
#. module: stock
#: selection:stock.picking,type:0
msgid "Sending Goods"
-msgstr "Envoi de marchandises"
+msgstr "Livraison de marchandise"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_customers
+msgid "Customers"
+msgstr "Clients"
#. module: stock
#: field:stock.warehouse,lot_output_id:0
msgid "Location Output"
-msgstr "Emplacement de sortie"
+msgstr "Emplacement Sortant"
#. module: stock
#: help:product.template,property_stock_production:0
-msgid "For the current product (template), this stock location will be used, instead of the default one, as the source location for stock moves generated by production orders"
-msgstr "Pour le produit courant (modèle), cette localisation de stock sera utilisée, au lieu de celle par défaut, comme localisation source pour les mouvements de stock généré par les ordres de fabrication "
+msgid ""
+"For the current product (template), this stock location will be used, "
+"instead of the default one, as the source location for stock moves generated "
+"by production orders"
+msgstr ""
+"Pour le produit courant (patron), cet emplacement de stock sera utilisé, à "
+"la place de celui par défaut, comme emplacement source pour les mouvements "
+"de stock gérérés par les commandes de production"
#. module: stock
#: wizard_view:stock.invoice_onshipping,init:0
@@ -759,27 +680,27 @@ msgstr "Confirmé"
#. module: stock
#: view:stock.picking:0
msgid "Supplier Invoice Control"
-msgstr ""
+msgstr "Contrôle des Factures Fournisseur"
#. module: stock
#: field:stock.location,name:0
msgid "Location Name"
-msgstr "Groupe de lot"
+msgstr "Nom de l'emplacement"
#. module: stock
#: view:stock.inventory:0
msgid "Posted Inventory"
-msgstr "Inventaire posté"
+msgstr "Inventaire Posté"
#. module: stock
#: view:stock.picking.move.wizard:0
msgid "Add"
-msgstr ""
+msgstr "Ajouter"
#. module: stock
#: field:stock.inventory,move_ids:0
msgid "Created Moves"
-msgstr "Mouvements créés"
+msgstr "Crée mouvement"
#. module: stock
#: selection:stock.inventory,state:0
@@ -789,15 +710,14 @@ msgid "Draft"
msgstr "Brouillon"
#. module: stock
-#: rml:stock.picking.list:0
+#: xsl:stock.picking.list:0
msgid "Packing Date"
-msgstr ""
+msgstr "Date du Colisage"
#. module: stock
-#: model:ir.actions.act_window,name:stock.action_location_tree
-#: model:ir.ui.menu,name:stock.menu_action_location_tree
-msgid "Stock Locations Structure"
-msgstr ""
+#: selection:stock.move,state:0
+msgid "cancel"
+msgstr "annuler"
#. module: stock
#: selection:stock.move,priority:0
@@ -807,12 +727,12 @@ msgstr "Non urgent"
#. module: stock
#: field:stock.move,product_uos_qty:0
msgid "Quantity (UOS)"
-msgstr "Quantité US"
+msgstr "Quantité (UP)"
#. module: stock
#: field:stock.move,tracking_id:0
msgid "Tracking lot"
-msgstr "Numéro de suivi"
+msgstr "Suivi lot"
#. module: stock
#: selection:stock.picking,invoice_state:0
@@ -824,55 +744,55 @@ msgstr "A facturer"
#: field:stock.move,state:0
#: field:stock.picking,state:0
msgid "Status"
-msgstr ""
+msgstr "État"
#. module: stock
#: field:stock.location,posy:0
msgid "Shelves (Y)"
-msgstr "Position Y"
+msgstr "Rayon (Y)"
#. module: stock
-#: field:stock.location,usage:0
-msgid "Location type"
-msgstr "Utilisation"
+#: xsl:stock.picking.list:0
+msgid "Concerns:"
+msgstr "Concerne :"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_all
#: wizard_field:stock.picking.make,init,pickings:0
#: model:ir.ui.menu,name:stock.menu_action_picking_all
msgid "Packings"
-msgstr "Les colis"
+msgstr "Colisages"
#. module: stock
#: wizard_view:stock.picking.make,init:0
#: model:ir.actions.wizard,name:stock.make_picking
msgid "Make packing"
-msgstr "Faire le colisage"
+msgstr "Créer le colisage"
#. module: stock
-#: field:stock.picking,backorder_id:0
-msgid "Back Order"
-msgstr ""
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Ventes & Achats"
#. module: stock
#: view:stock.picking.move.wizard:0
msgid "Move Lines"
-msgstr ""
+msgstr "Lignes de mouvements"
#. module: stock
#: view:stock.location:0
msgid "Localisation"
-msgstr "Localisation"
+msgstr "Emplacement"
#. module: stock
#: model:stock.location,name:stock.stock_location_output
msgid "Output"
-msgstr ""
+msgstr "Sortie"
#. module: stock
#: view:stock.picking:0
msgid "Split in Two"
-msgstr ""
+msgstr "Diviser les lignes"
#. module: stock
#: selection:stock.picking,move_type:0
@@ -882,23 +802,23 @@ msgstr "Livraison directe"
#. module: stock
#: model:ir.actions.wizard,name:stock.track_line
msgid "Track line"
-msgstr "Tracer les lignes"
+msgstr "Suivre la ligne"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_production_lot_form
#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
msgid "Production Lots"
-msgstr ""
+msgstr "Lots de production"
#. module: stock
-#: rml:stock.picking.list:0
+#: xsl:stock.picking.list:0
msgid "Shipping Date"
-msgstr ""
+msgstr "Date de Livraison"
#. module: stock
-#: rml:stock.picking.list:0
+#: xsl:stock.picking.list:0
msgid "Recipient"
-msgstr ""
+msgstr "Destinataire"
#. module: stock
#: view:product.template:0
@@ -911,7 +831,7 @@ msgstr "Propriétés"
#: model:ir.ui.menu,name:stock.menu_action_incoterms_tree
#: view:stock.incoterms:0
msgid "Incoterms"
-msgstr ""
+msgstr "Incoterms"
#. module: stock
#: field:stock.location,child_ids:0
@@ -927,12 +847,12 @@ msgstr ""
#. module: stock
#: field:stock.warehouse,lot_stock_id:0
msgid "Location Stock"
-msgstr "Emplacement du stock"
+msgstr "Emplacement de Stock"
#. module: stock
#: field:product.template,property_stock_procurement:0
msgid "Procurement Location"
-msgstr "Emplacement des approvisionnements"
+msgstr "Emplacement d'approvisionnement"
#. module: stock
#: field:stock.incoterms,active:0
@@ -940,34 +860,40 @@ msgstr "Emplacement des approvisionnements"
#: field:stock.picking,active:0
#: field:stock.tracking,active:0
msgid "Active"
-msgstr "Active"
+msgstr "Actif"
#. module: stock
#: wizard_field:stock.move.track,init,tracking_prefix:0
msgid "Tracking prefix"
-msgstr "Préfixe pour traçabilité"
+msgstr "Préfix du Suivi"
#. module: stock
-#: wizard_view:stock.partial_picking,end2:0
-msgid "The packing has been successfully made !"
-msgstr ""
+#: xsl:stock.picking.list:0
+msgid "Shipping ref."
+msgstr "Réf. Livraison"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree5
#: model:ir.ui.menu,name:stock.menu_action_picking_tree5
msgid "Packings to Process"
-msgstr ""
+msgstr "Colisages à traiter"
#. module: stock
#: field:stock.move,address_id:0
#: field:stock.picking.move.wizard,address_id:0
msgid "Dest. Address"
-msgstr "Adresse de destination"
+msgstr "Adresse de Dest."
#. module: stock
#: help:product.template,property_stock_procurement:0
-msgid "For the current product (template), this stock location will be used, instead of the default one, as the source location for stock moves generated by procurements"
-msgstr "Pour le produit courant (modèle), cette localisation de stock sera utilisée, au lieu de celle par défaut, comme localisation source pour les mouvements de stock généré par les achats. "
+msgid ""
+"For the current product (template), this stock location will be used, "
+"instead of the default one, as the source location for stock moves generated "
+"by procurements"
+msgstr ""
+"Pour le produit courant (patron), cet emplacement de stock sera utilisé, à "
+"la place de celui par défaut, comme emplacement source pour les mouvements "
+"de stock gérérés par les approvisionnements"
#. module: stock
#: view:stock.move:0
@@ -985,18 +911,18 @@ msgstr "Quantité"
#. module: stock
#: model:ir.model,name:stock.model_stock_picking_move_wizard
msgid "stock.picking.move.wizard"
-msgstr ""
+msgstr "stock.picking.move.wizard"
#. module: stock
#: field:stock.location,address_id:0
msgid "Location Address"
-msgstr ""
+msgstr "Adresse du dépôt"
#. module: stock
#: view:stock.production.lot:0
#: model:res.request.link,name:stock.req_link_tracking
msgid "Production Lot"
-msgstr "Lot de fabrication"
+msgstr "Lot de Production"
#. module: stock
#: xsl:stock.location.overview.all:0
@@ -1004,35 +930,30 @@ msgstr "Lot de fabrication"
msgid "Code"
msgstr "Code"
-#. module: stock
-#: model:stock.location,name:stock.stock_location_13
-msgid "Stock Level 1"
-msgstr ""
-
#. module: stock
#: model:ir.actions.report.xml,name:stock.report_product_location
msgid "Products Localisations"
-msgstr "Localisation des produits"
+msgstr "Emplacements de Productions"
#. module: stock
#: field:stock.warehouse,lot_input_id:0
msgid "Location Input"
-msgstr "Emplacement d'entrée\\""
+msgstr "Emplacement d'Entrée"
#. module: stock
#: field:stock.location,allocation_method:0
msgid "Allocation Method"
-msgstr "Méthode d'allocation"
+msgstr "Méthod d'attribution"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_location_form
#: model:ir.ui.menu,name:stock.menu_action_location_form
msgid "Locations"
-msgstr ""
+msgstr "Emplacements"
#. module: stock
-#: rml:stock.picking.list:0
-msgid "Qty"
+#: wizard_button:stock.back_order.partial_picking,init,split:0
+msgid "Make Picking"
msgstr ""
#. module: stock
@@ -1044,7 +965,7 @@ msgstr "Assigné"
#. module: stock
#: view:stock.picking:0
msgid "General Information"
-msgstr "Information générale"
+msgstr "Informations générales"
#. module: stock
#: selection:stock.location,usage:0
@@ -1056,7 +977,7 @@ msgstr "Production"
#: selection:stock.move,state:0
#: selection:stock.picking,state:0
msgid "Done"
-msgstr "Terminé"
+msgstr "Terminer"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree2
@@ -1064,12 +985,12 @@ msgstr "Terminé"
#: model:ir.ui.menu,name:stock.menu_action_picking_tree7
#: model:ir.ui.menu,name:stock.menu_picking_waiting
msgid "Assigned Packings"
-msgstr ""
+msgstr "Colisages Assignés"
#. module: stock
#: wizard_button:stock.picking.make,init,end:0
#: wizard_button:stock.move.split,init,end:0
-#: wizard_button:stock.partial_picking,init,end:0
+#: wizard_button:stock.back_order.partial_picking,init,end:0
#: wizard_button:stock.return.picking,init,end:0
#: wizard_button:stock.move.track,init,end:0
#: wizard_button:stock.invoice_onshipping,init,end:0
@@ -1080,59 +1001,56 @@ msgstr ""
msgid "Cancel"
msgstr "Annuler"
-#. module: stock
-#: wizard_button:stock.partial_picking,end2,end:0
-msgid "Close"
-msgstr ""
-
#. module: stock
#: model:ir.actions.report.xml,name:stock.report_move_labels
msgid "Print Item Labels"
-msgstr "Imprimer les étiquettes"
+msgstr "Impression des étiquettes"
#. module: stock
-#: help:stock.location,chained_auto_packing:0
-msgid "This is used only if you selected a chained location type.\n"
-"The 'Automatic Move' value will create a stock move after the current one that will be validated automatically. With 'Manual Operation', the stock move has to be validated by a worker. With 'Automatic No Step Added', the location is replaced in the original move."
-msgstr ""
+#: view:stock.move:0
+msgid "Moves"
+msgstr "Mouvements"
#. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic No Step Added"
-msgstr ""
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Move Information"
+msgstr "Information sur le Mouvement"
#. module: stock
#: field:stock.inventory,date_done:0
msgid "Date done"
-msgstr "Fait le"
+msgstr "Date de fin"
#. module: stock
#: view:stock.move:0
#: view:stock.picking:0
msgid "Split in production lots"
-msgstr "Diviser en lots de fabrication"
+msgstr "Diviser en lots de production"
#. module: stock
#: wizard_button:stock.move.split,init,split:0
msgid "Split"
-msgstr "Répartir"
+msgstr "Diviser"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_move_form3
#: model:ir.ui.menu,name:stock.menu_action_move_form3
msgid "Draft Moves"
-msgstr "Mouvements brouillon"
-
-#. module: stock
-#, python-format
-#: code:addons/stock/stock.py:0
-msgid "You can not remove a lot line !"
-msgstr ""
+msgstr "Mouvements en brouillon"
#. module: stock
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Split move lines in two"
+msgstr "Diviser les lignes en deux"
#. module: stock
#: field:stock.move,date_planned:0
@@ -1143,12 +1061,12 @@ msgstr "Date prévue"
#: model:ir.actions.act_window,name:stock.action_warehouse_form
#: model:ir.ui.menu,name:stock.menu_action_warehouse_form
msgid "Warehouses"
-msgstr ""
+msgstr "Entrepôts"
#. module: stock
#: field:product.template,property_stock_inventory:0
msgid "Inventory Location"
-msgstr "Emplacement de l'inventaire"
+msgstr "Emplacement de l'Inventaire"
#. module: stock
#: field:stock.location,account_id:0
@@ -1158,7 +1076,7 @@ msgstr "Compte d'inventaire"
#. module: stock
#: view:stock.inventory:0
msgid "Confirm Inventory"
-msgstr "Confirmer inventaire"
+msgstr "Confirmer l'Inventaire"
#. module: stock
#: xsl:stock.location.overview:0
@@ -1169,8 +1087,13 @@ msgstr "Prix unitaire"
#. module: stock
#: help:product.template,property_stock_inventory:0
-msgid "For the current product (template), this stock location will be used, instead of the default one, as the source location for stock moves generated when you do an inventory"
-msgstr "Pour le produit courant (modèle), cette localisation de stock sera utilisée, au lieu de celle par défaut, comme localisation source pour les mouvements de stock généré lorsque vous faire un inventaire. "
+msgid ""
+"For the current product (template), this stock location will be used, "
+"instead of the default one, as the source location for stock moves generated "
+"when you do an inventory"
+msgstr ""
+"Cette localisation de stock sera utilisée au lieu de celle par défaut, en "
+"tant que localisation source générées quand vous effectué un inventaire"
#. module: stock
#: model:ir.ui.menu,name:stock.menu_traceability_low
@@ -1178,14 +1101,18 @@ msgid "Low Level"
msgstr "Bas niveau"
#. module: stock
-#: view:stock.picking:0
-msgid "Split move lines in two"
-msgstr "Diviser les lignes de mouvement en deux"
+#: xsl:stock.picking.list:0
+msgid "Customer ref."
+msgstr "Réf. Client"
#. module: stock
#: help:res.partner,property_stock_supplier:0
-msgid "This stock location will be used, instead of the default one, as the source location for goods you receive from the current partner"
-msgstr "Cette localisation de stock sera utilisée, au lieu de celle par défaut, en tant que source de localisation pour les marchandises vous recevez de partenaire par défaut"
+msgid ""
+"This stock location will be used, instead of the default one, as the source "
+"location for goods you receive from the current partner"
+msgstr ""
+"Cette localisation de stock sera utilisée au lieu de celle par défaut, en "
+"tant que localisation source pour les biens recus du partenaire courant"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_move_form4
@@ -1196,34 +1123,34 @@ msgstr "Mouvements assignés"
#. module: stock
#: view:product.product:0
msgid "Stocks"
-msgstr ""
+msgstr "Stocks"
#. module: stock
#: field:stock.warehouse,partner_address_id:0
msgid "Owner Address"
-msgstr "Adresse du propriétaire"
+msgstr "Adresses du propriétaire"
#. module: stock
#: wizard_field:stock.invoice_onshipping,init,journal_id:0
msgid "Destination Journal"
-msgstr "Journal de destination"
+msgstr "Journal de Destination"
#. module: stock
#: model:stock.location,name:stock.stock_location_stock
msgid "Stock"
-msgstr ""
+msgstr "Stock"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree6
#: model:ir.ui.menu,name:stock.menu_action_picking_tree6
msgid "Internal Packings"
-msgstr ""
+msgstr "Colisages Internes"
#. module: stock
#: xsl:stock.location.overview:0
#: xsl:stock.location.overview.all:0
#: rml:lot.location:0
-#: rml:stock.picking.list:0
+#: xsl:stock.picking.list:0
#: field:stock.inventory.line,product_id:0
#: field:stock.move,product_id:0
msgid "Product"
@@ -1235,7 +1162,7 @@ msgid "Return"
msgstr "Retour"
#. module: stock
-#: rml:stock.picking.list:0
+#: xsl:stock.picking.list:0
#: field:stock.production.lot.revision,description:0
msgid "Description"
msgstr "Description"
@@ -1249,12 +1176,12 @@ msgstr "Auto-colisage"
#: model:ir.actions.act_window,name:stock.action_picking_tree3_delivery
#: model:ir.ui.menu,name:stock.menu_action_picking_tree3_delivery
msgid "Waiting Delivery Orders"
-msgstr ""
+msgstr "Ordre de livraison en attente"
#. module: stock
#: field:stock.location,posz:0
msgid "Height (Z)"
-msgstr "Position Z"
+msgstr "Hauteur (Z)"
#. module: stock
#: model:ir.actions.act_window,name:stock.action5
@@ -1269,36 +1196,40 @@ msgid "Cancel Inventory"
msgstr "Annuler inventaire"
#. module: stock
-#: view:stock.picking:0
-msgid "Cancel Assignation"
-msgstr "Annuler l'assignation"
+#: selection:stock.move,state:0
+#: selection:stock.picking,state:0
+msgid "Waiting"
+msgstr "En attente"
#. module: stock
#: help:product.category,property_stock_journal:0
-msgid "This journal will be used for the accounting move generated by stock move"
-msgstr "Ce journal sera utilisé pour les mouvements comptables généré par les mouvements de stock"
+msgid ""
+"This journal will be used for the accounting move generated by stock move"
+msgstr ""
+"Ce journal sera utilisé pour les mouvements de compte générés par les "
+"mouvements de stock"
#. module: stock
#: field:product.category,property_stock_account_output_categ:0
#: field:product.template,property_stock_account_output:0
msgid "Stock Output Account"
-msgstr "Compte de sortie de stock"
+msgstr "Compte de Stock Sortant"
#. module: stock
#: xsl:stock.location.overview:0
#: xsl:stock.location.overview.all:0
msgid "Variants"
-msgstr "Variante"
+msgstr "Variantes"
#. module: stock
#: field:stock.location,posx:0
msgid "Corridor (X)"
-msgstr "Position X"
+msgstr "Couloir (X)"
#. module: stock
-#: model:stock.location,name:stock.stock_location_7
-msgid "European Customers"
-msgstr ""
+#: model:stock.location,name:stock.stock_location_suppliers
+msgid "Suppliers"
+msgstr "Fournisseurs"
#. module: stock
#: view:stock.picking:0
@@ -1308,12 +1239,12 @@ msgstr "Forcer l'assignation"
#. module: stock
#: selection:stock.location,chained_location_type:0
msgid "Customer"
-msgstr ""
+msgstr "Client"
#. module: stock
#: field:stock.tracking,move_ids:0
msgid "Moves tracked"
-msgstr "Suivi de stock"
+msgstr "Mouvements Suivis"
#. module: stock
#: field:stock.incoterms,name:0
@@ -1326,12 +1257,12 @@ msgstr "Nom"
#. module: stock
#: model:ir.actions.report.xml,name:stock.report_location_overview_all
msgid "Location Content (With childs)"
-msgstr "Contenu de l'emplacement (avec enfants)"
+msgstr "Contenu de l'Emplacement (avec enfants)"
#. module: stock
#: model:stock.location,name:stock.stock_location_locations_virtual
msgid "Virtual Locations"
-msgstr ""
+msgstr "Emplacements Virtuels"
#. module: stock
#: field:stock.production.lot.revision,name:0
@@ -1339,45 +1270,34 @@ msgid "Revision name"
msgstr "Nom de la révision"
#. module: stock
-#: field:stock.move,product_uos:0
-msgid "Product UOS"
-msgstr "Unité secondaire"
+#: field:stock.production.lot,revisions:0
+msgid "Revisions"
+msgstr "Révisions"
#. module: stock
#: view:stock.inventory.line:0
msgid "Stock Inventory Lines"
-msgstr "Lignes d'inventaire de stock"
+msgstr "Lignes d'Inventaire de Stock"
#. module: stock
#: model:ir.actions.report.xml,name:stock.report_location_overview
msgid "Location Overview"
-msgstr "Contenu de la zone de stockage"
-
-#. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Move Information"
-msgstr "Information mouvement"
+msgstr "Aperçu de l'Emplacement"
#. module: stock
#: view:stock.location:0
msgid "Stock location"
-msgstr "Localisation de stock"
+msgstr "Emplacement de sotck"
#. module: stock
#: view:product.template:0
msgid "Accounting Entries"
-msgstr ""
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Calendar View"
-msgstr ""
+msgstr "Écritures comptables"
#. module: stock
#: model:stock.location,name:stock.stock_location_locations
msgid "Physical Locations"
-msgstr ""
+msgstr "Emplacements physiques"
#. module: stock
#: model:ir.actions.wizard,name:stock.move_split
@@ -1387,22 +1307,22 @@ msgstr "Diviser la ligne de mouvement"
#. module: stock
#: help:product.category,property_stock_account_output_categ:0
msgid "This account will be used to value the output stock"
-msgstr "Ce compte sera utilisé pour valoriser le stock de sortie"
+msgstr "Ce compte sera utilisé pour valoriser le stock sortant"
#. module: stock
#: field:stock.picking,type:0
msgid "Shipping Type"
-msgstr "Type d'envoi"
+msgstr "Type de Livraison"
#. module: stock
#: field:stock.picking,invoice_state:0
msgid "Invoice Status"
-msgstr ""
+msgstr "État de la facture"
#. module: stock
#: selection:stock.location,usage:0
msgid "View"
-msgstr ""
+msgstr "Vue"
#. module: stock
#: model:ir.model,name:stock.model_stock_inventory
@@ -1420,65 +1340,58 @@ msgstr "Ligne d'inventaire"
#. module: stock
#: field:stock.location,chained_delay:0
msgid "Chained Delay (days)"
-msgstr ""
+msgstr "Délai lié (jours)"
#. module: stock
#: view:res.partner:0
msgid "Stock Properties"
-msgstr ""
+msgstr "Propriétés du Stock"
#. module: stock
#: field:stock.move,location_id:0
msgid "Source Location"
-msgstr "Emplacement Origine"
-
-#. module: stock
-#: rml:stock.picking.list:0
-msgid "Packing List"
-msgstr ""
+msgstr "Emplacement source"
#. module: stock
#: view:stock.picking:0
msgid "Others info"
-msgstr "Autres informations"
+msgstr "Autres infos"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_form
#: model:ir.ui.menu,name:stock.menu_action_picking_form
msgid "New Reception Packing"
-msgstr ""
+msgstr "Nouveau Colisage Entrant"
#. module: stock
#: view:stock.move:0
#: view:stock.picking:0
msgid "Move State"
-msgstr "État mouvement"
+msgstr "État du Mouvement"
#. module: stock
#: wizard_field:stock.move.track,init,quantity:0
msgid "Quantity per lot"
-msgstr "Quantité par lot"
+msgstr "Quantité par Lot"
#. module: stock
#: field:product.category,property_stock_account_input_categ:0
#: field:product.template,property_stock_account_input:0
msgid "Stock Input Account"
-msgstr "Compte de stock d'entrée"
+msgstr "Compte du Stock d'Entrée"
#. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_calendar_delivery
-#: model:ir.ui.menu,name:stock.menu_picking_calendar_delivery
-msgid "Calendar of Deliveries"
-msgstr ""
+#: field:stock.move,product_uos:0
+msgid "Product UOS"
+msgstr "UP Produit"
#. module: stock
#: field:stock.location,comment:0
#: view:stock.location:0
msgid "Additional Information"
-msgstr "Info. supplémentaire"
+msgstr "Information complémentaire"
#. module: stock
#: field:product.template,property_stock_production:0
msgid "Production Location"
-msgstr "Emplacement de la production"
-
+msgstr "Emplacement Production"
diff --git a/addons/stock/product.py b/addons/stock/product.py
index f9eeef4f907..de035b213de 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -131,35 +131,32 @@ class product_product(osv.osv):
res[prod_id] -= amount
return res
- def _get_product_available_func(states, what):
- def _product_available(self, cr, uid, ids, field_names=None, arg=False, context={}):
- if not field_names:
- field_names=[]
- context.update({
- 'states':states,
- 'what':what
- })
- stock=self.get_product_available(cr,uid,ids,context=context)
- res = {}
+ def _product_available(self, cr, uid, ids, field_names=None, arg=False, context={}):
+ if not field_names:
+ field_names=[]
+ res = {}
+ for id in ids:
+ res[id] = {}.fromkeys(field_names, 0.0)
+ for f in field_names:
+ c = context.copy()
+ if f=='qty_available':
+ c.update({ 'states':('done',), 'what':('in', 'out') })
+ if f=='virtual_available':
+ c.update({ 'states':('confirmed','waiting','assigned','done'), 'what':('in', 'out') })
+ if f=='incoming_qty':
+ c.update({ 'states':('confirmed','waiting','assigned'), 'what':('in',) })
+ if f=='outgoing_qty':
+ c.update({ 'states':('confirmed','waiting','assigned'), 'what':('out',) })
+ stock=self.get_product_available(cr,uid,ids,context=c)
for id in ids:
- res[id] = {}.fromkeys(field_names, 0.0)
- for a in field_names:
- res[id][a] = stock.get(id, 0.0)
- return res
-
- return _product_available
-
- _product_qty_available = _get_product_available_func(('done',), ('in', 'out'))
- _product_virtual_available = _get_product_available_func(('confirmed','waiting','assigned','done'), ('in', 'out'))
- _product_outgoing_qty = _get_product_available_func(('confirmed','waiting','assigned'), ('out',))
- _product_incoming_qty = _get_product_available_func(('confirmed','waiting','assigned'), ('in',))
-
+ res[id][f] = stock.get(id, 0.0)
+ return res
_columns = {
- 'qty_available': fields.function(_product_qty_available, method=True, type='float', string='Real Stock',multi='qty_available', help="Current quantities of products in selected locations or all internal if none have been selected."),
- 'virtual_available': fields.function(_product_virtual_available, method=True, type='float', string='Virtual Stock',multi='qty_available', help="Futur stock for this product according to the selected location or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming."),
- 'incoming_qty': fields.function(_product_incoming_qty, method=True, type='float', string='Incoming',multi='qty_available', help="Quantities of products that are planned to arrive in selected locations or all internal if none have been selected."),
- 'outgoing_qty': fields.function(_product_outgoing_qty, method=True, type='float', string='Outgoing',multi='qty_available', help="Quantities of products that are planned to leave in selected locations or all internal if none have been selected."),
+ 'qty_available': fields.function(_product_available, method=True, type='float', string='Real Stock', help="Current quantities of products in selected locations or all internal if none have been selected.", multi='qty_available'),
+ 'virtual_available': fields.function(_product_available, method=True, type='float', string='Virtual Stock', help="Futur stock for this product according to the selected location or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming.", multi='qty_available'),
+ 'incoming_qty': fields.function(_product_available, method=True, type='float', string='Incoming', help="Quantities of products that are planned to arrive in selected locations or all internal if none have been selected.", multi='qty_available'),
+ 'outgoing_qty': fields.function(_product_available, method=True, type='float', string='Outgoing', help="Quantities of products that are planned to leave in selected locations or all internal if none have been selected.", multi='qty_available'),
'track_production' : fields.boolean('Track Production Lots' , help="Force to use a Production Lot during production order"),
'track_incoming' : fields.boolean('Track Incomming Lots', help="Force to use a Production Lot during receptions"),
'track_outgoing' : fields.boolean('Track Outging Lots', help="Force to use a Production Lot during deliveries"),
diff --git a/addons/stock/product_data.xml b/addons/stock/product_data.xml
index 1a60ca0781b..b6f7b5aaa8b 100644
--- a/addons/stock/product_data.xml
+++ b/addons/stock/product_data.xml
@@ -1,13 +1,13 @@
-
+
property_stock_journal
-
+
-
+
property_stock_account_output
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 23c9be50dea..7716dcf9aa7 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -61,7 +61,17 @@
-
+
+
+
+
+
+
+
+
+
+
+
@@ -103,7 +113,7 @@
-
+
@@ -187,38 +197,39 @@
-
+
- |
- Product
- |
Description
|
Lot
|
+
+ State
+ |
Qty
|
- Location
+ Location
|
+
[[ repeatIn([line for line in picking.move_lines if (line.state == 'assigned' )],'move_lines') ]]
-
+
|
- [[ move_lines.product_id.default_code ]]
- |
-
- [[ move_lines.product_id.name ]]
+ [ [[ move_lines.product_id.default_code ]] ] [[ move_lines.product_id.name ]]
|
[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]
|
+
+ [[ move_lines.state ]]
+ |
[[ move_lines.product_qty ]]
|
@@ -226,13 +237,63 @@
[[ move_lines.product_uom.name ]]
- [[ (move_lines.location_id and move_lines.location_id.name) or '' ]]
+ [[ (move_lines.location_id and move_lines.location_id.name) or '' ]]
|
-
+
+
+
+
+ Non Assigned Products:
+
+
+
+
+ [[ repeatIn([line for line in picking.move_lines if (line.state != 'assigned' )],'move_lines') ]]
+
+
+ |
+ [ [[ move_lines.product_id.default_code ]] ] [[ move_lines.product_id.name ]]
+ |
+
+ [[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]
+ |
+
+ [[ move_lines.state ]]
+ |
+
+ [[ move_lines.product_qty ]]
+ |
+
+ [[ move_lines.product_uom.name ]]
+ |
+
+ [[ (move_lines.location_id and move_lines.location_id.name) or '' ]]
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index da20aa0d1fe..80c3013adfc 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -1,16 +1,17 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_stock_incoterms_system,stock.incoterms.system,model_stock_incoterms,base.group_system,1,1,1,1
-access_stock_warehouse_system,stock.warehouse.system,model_stock_warehouse,base.group_system,1,1,1,1
-access_stock_location_system,stock.location.system,model_stock_location,base.group_system,1,1,1,1
-access_stock_incoterms,stock.incoterms,model_stock_picking_move_wizard,base.group_system,1,0,0,0
-access_stock_warehouse,stock.warehouse,model_stock_picking_move_wizard,base.group_system,1,0,0,0
-access_stock_location,stock.location,model_stock_picking_move_wizard,base.group_system,1,0,0,0
-access_stock_picking_move_wizard,stock.picking.move.wizard,model_stock_picking_move_wizard,stock.group_stock_user,1,0,0,0
-access_stock_tracking,stock.tracking,model_stock_tracking,stock.group_stock_user,1,1,1,0
-access_stock_picking,stock.picking,model_stock_picking,stock.group_stock_user,1,1,1,1
-access_stock_production_lot,stock.production.lot,model_stock_production_lot,stock.group_stock_user,1,1,1,0
-access_stock_production_lot_revision,stock.production.lot.revision,model_stock_production_lot_revision,stock.group_stock_user,1,1,1,1
-access_stock_move,stock.move,model_stock_move,stock.group_stock_user,1,1,1,0
-access_stock_inventory,stock.inventory,model_stock_inventory,stock.group_stock_user,1,1,1,1
-access_stock_inventory_line,stock.inventory.line,model_stock_inventory_line,stock.group_stock_user,1,1,1,1
-access_stock_report_prodlots,stock.report.prodlots,model_stock_report_prodlots,stock.group_stock_user,1,0,0,0
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_stock_incoterms_all","stock.incoterms all","model_stock_incoterms",,1,0,0,0
+"access_stock_warehouse_manager","stock.warehouse.manager","model_stock_warehouse","stock.group_stock_manager",1,1,1,1
+"access_stock_warehouse_user","stock.warehouse.user","model_stock_warehouse","base.group_user",1,0,0,0
+"access_stock_location_manager","stock.location.manager","model_stock_location","stock.group_stock_manager",1,1,1,1
+"access_stock_location_user","stock.location.user","model_stock_location","stock.group_stock_user",1,0,0,0
+"access_stock_location_partner_manager","stock.location partner manager","model_stock_location","base.group_partner_manager",1,0,0,0
+"access_stock_picking_move_wizard","stock.picking.move.wizard","model_stock_picking_move_wizard","stock.group_stock_user",1,1,1,1
+"access_stock_tracking","stock.tracking","model_stock_tracking","stock.group_stock_user",1,1,1,0
+"access_stock_picking","stock.picking","model_stock_picking","stock.group_stock_user",1,1,1,1
+"access_stock_production_lot","stock.production.lot","model_stock_production_lot","stock.group_stock_user",1,1,1,0
+"access_stock_production_lot_revision","stock.production.lot.revision","model_stock_production_lot_revision","stock.group_stock_user",1,1,1,1
+"access_stock_move","stock.move","model_stock_move","stock.group_stock_user",1,1,1,0
+"access_stock_inventory","stock.inventory","model_stock_inventory","stock.group_stock_user",1,1,1,1
+"access_stock_inventory_line","stock.inventory.line","model_stock_inventory_line","stock.group_stock_user",1,1,1,1
+"access_stock_report_prodlots","stock.report.prodlots","model_stock_report_prodlots","stock.group_stock_manager",1,0,0,0
+"access_stock_location_product_manager","stock.location product manager","model_stock_location","product.group_product_manager",1,0,0,0
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 6bd063ed388..f3f28df553f 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -1,6 +1,6 @@
-
+
Stock / Manager
@@ -9,5 +9,13 @@
Stock / Worker
+
+
+
+
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index f0c71c1199f..5718c344e4d 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -77,13 +77,20 @@ class stock_location(osv.osv):
res[m.id] = _get_one_full_name(m)
return res
- def _product_qty_available(self, cr, uid, ids, name, arg, context={}):
- res = {}.fromkeys(ids, 0.0)
- if 'product_id' not in context:
- return res
+ def _product_qty_available(self, cr, uid, ids, field_names, arg, context={}):
+ res = {}
for id in ids:
- location_ids = self.search(cr, uid, [('location_id', 'child_of', [id])])
- res[id] = self._product_get_multi_location(cr, uid, location_ids, [context['product_id']], context, ('done',), ('in','out'))[context['product_id']]
+ res[id] = {}.fromkeys(field_names, 0.0)
+ if ('product_id' not in context) or not ids:
+ return res
+ #location_ids = self.search(cr, uid, [('location_id', 'child_of', ids)])
+ for loc in ids:
+ context['location'] = [loc]
+ prod = self.pool.get('product.product').browse(cr, uid, context['product_id'], context)
+ if 'stock_real' in field_names:
+ res[loc]['stock_real'] = prod.qty_available
+ if 'stock_virtual' in field_names:
+ res[loc]['stock_virtual'] = prod.virtual_available
return res
_columns = {
@@ -94,8 +101,8 @@ class stock_location(osv.osv):
'complete_name': fields.function(_complete_name, method=True, type='char', size=100, string="Location Name"),
- 'stock_real': fields.function(_product_qty_available, method=True, type='float', string='Real Stock'),
- 'stock_virtual': fields.function(_product_qty_available, method=True, type='float', string='Virtual Stock'),
+ 'stock_real': fields.function(_product_qty_available, method=True, type='float', string='Real Stock', multi="stock"),
+ 'stock_virtual': fields.function(_product_qty_available, method=True, type='float', string='Virtual Stock', multi="stock"),
'account_id': fields.many2one('account.account', string='Inventory Account', domain=[('type','!=','view')]),
'location_id': fields.many2one('stock.location', 'Parent Location', select=True, ondelete='cascade'),
@@ -323,11 +330,14 @@ class stock_picking(osv.osv):
if isinstance(ids, (int, long)):
ids=[ids]
for pick in self.browse(cr, uid, ids, context):
- cr.execute("""update stock_move set
- date_planned=%s
+ sql_str="""update stock_move set
+ date_planned='%s'
where
- picking_id=%d and
- (date_planned=%s or date_planned>%s)""", (value,pick.id,pick.max_date,value))
+ picking_id=%d """ % (value,pick.id)
+
+ if pick.max_date:
+ sql_str += " and (date_planned='"+pick.max_date+"' or date_planned>'"+value+"')"
+ cr.execute(sql_str)
return True
def _set_minimum_date(self, cr, uid, ids, name, value, arg, context):
@@ -335,11 +345,13 @@ class stock_picking(osv.osv):
if isinstance(ids, (int, long)):
ids=[ids]
for pick in self.browse(cr, uid, ids, context):
- cr.execute("""update stock_move set
- date_planned=%s
+ sql_str="""update stock_move set
+ date_planned='%s'
where
- picking_id=%d and
- (date_planned=%s or date_planned<%s)""", (value,pick.id,pick.min_date,value))
+ picking_id=%d """ % (value,pick.id)
+ if pick.min_date:
+ sql_str += " and (date_planned='"+pick.min_date+"' or date_planned<'"+value+"')"
+ cr.execute(sql_str)
return True
def get_min_max_date(self, cr, uid, ids, field_name, arg, context={}):
@@ -396,7 +408,7 @@ class stock_picking(osv.osv):
("invoiced","Invoiced"),
("2binvoiced","To be invoiced"),
("none","Not from Packing")], "Invoice Status",
- select=True, required=True),
+ select=True, required=True, readonly=True, states={'draft':[('readonly',False)]}),
}
_defaults = {
'name': lambda self,cr,uid,context: self.pool.get('ir.sequence').get(cr, uid, 'stock.picking'),
@@ -561,9 +573,19 @@ class stock_picking(osv.osv):
def _get_taxes_invoice(self, cursor, user, move_line, type):
'''Return taxes ids for the move line'''
if type in ('in_invoice', 'in_refund'):
- return [x.id for x in move_line.product_id.supplier_taxes_id]
+ taxes = move_line.product_id.supplier_taxes_id
else:
- return [x.id for x in move_line.product_id.taxes_id]
+ taxes = move_line.product_id.taxes_id
+
+ if move_line.picking_id and move_line.picking_id.address_id and move_line.picking_id.address_id.partner_id:
+ return self.pool.get('account.fiscal.position').map_tax(
+ cursor,
+ user,
+ move_line.picking_id.address_id.partner_id,
+ taxes
+ )
+ else:
+ return map(lambda x: x.id, taxes)
def _get_account_analytic_invoice(self, cursor, user, picking, move_line):
return False
@@ -592,10 +614,10 @@ class stock_picking(osv.osv):
partner = picking.address_id and picking.address_id.partner_id
if type in ('out_invoice', 'out_refund'):
account_id = partner.property_account_receivable.id
- payment_term_id= picking.sale_id.payment_term.id
+ if picking.sale_id and picking.sale_id.payment_term:
+ payment_term_id= picking.sale_id.payment_term.id
else:
account_id = partner.property_account_payable.id
-# payment_term_id = picking.purchase_id.payment_term.id
address_contact_id, address_invoice_id = \
self._get_address_invoice(cursor, user, picking).values()
@@ -607,7 +629,7 @@ class stock_picking(osv.osv):
else:
invoice_vals = {
'name': picking.name,
- 'origin': picking.name + ':' + picking.origin,
+ 'origin': picking.name + (picking.origin and (':' + picking.origin) or ''),
'type': type,
'account_id': account_id,
'partner_id': partner.id,
@@ -622,10 +644,8 @@ class stock_picking(osv.osv):
context=context)
invoices_group[partner.id] = invoice_id
res[picking.id] = invoice_id
-
sale_line_ids = sale_line_obj.search(cursor, user, [('order_id','=',picking.sale_id.id)])
sale_lines = sale_line_obj.browse(cursor, user, sale_line_ids, context=context)
-
for sale_line in sale_lines:
if sale_line.product_id.type == 'service' and sale_line.invoiced == False:
if group:
@@ -648,9 +668,11 @@ class stock_picking(osv.osv):
sale_line, type)
discount = self._get_discount_invoice(cursor, user, sale_line)
tax_ids = self._get_taxes_invoice(cursor, user, sale_line, type)
+
account_analytic_id = self._get_account_analytic_invoice(cursor,
user, picking, sale_line)
-
+
+ account_id = self.pool.get('account.fiscal.position').map_account(cursor, user, partner, account_id)
invoice_line_id = invoice_line_obj.create(cursor, user, {
'name': name,
'invoice_id': invoice_id,
@@ -666,7 +688,7 @@ class stock_picking(osv.osv):
sale_line_obj.write(cursor, user, [sale_line.id], {'invoiced':True,
'invoice_lines': [(6, 0, [invoice_line_id])],
})
-
+
for move_line in picking.move_lines:
if group:
name = picking.name + '-' + move_line.name
@@ -693,6 +715,7 @@ class stock_picking(osv.osv):
account_analytic_id = self._get_account_analytic_invoice(cursor,
user, picking, move_line)
+ account_id = self.pool.get('account.fiscal.position').map_account(cursor, user, partner, account_id)
invoice_line_id = invoice_line_obj.create(cursor, user, {
'name': name,
'invoice_id': invoice_id,
@@ -701,7 +724,7 @@ class stock_picking(osv.osv):
'account_id': account_id,
'price_unit': price_unit,
'discount': discount,
- 'quantity': move_line.product_uos_qty,
+ 'quantity': move_line.product_uos_qty or move_line.product_qty,
'invoice_line_tax_id': [(6, 0, tax_ids)],
'account_analytic_id': account_analytic_id,
}, context=context)
@@ -716,7 +739,6 @@ class stock_picking(osv.osv):
self.write(cursor, user, res.keys(), {
'invoice_state': 'invoiced',
}, context=context)
- print res
return res
stock_picking()
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index 5a85898bfe4..6af7d0b24f7 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -1,6 +1,16 @@
+
+
+ Stock Journal
+ STJ
+ general
+
+
+
+
+
diff --git a/addons/stock/wizard/wizard_invoice_onshipping.py b/addons/stock/wizard/wizard_invoice_onshipping.py
index 1274decd40a..270bc70101a 100644
--- a/addons/stock/wizard/wizard_invoice_onshipping.py
+++ b/addons/stock/wizard/wizard_invoice_onshipping.py
@@ -72,11 +72,9 @@ invoice_fields = {
def _get_type(obj, cr, uid, data, context):
picking_obj=pooler.get_pool(cr.dbname).get('stock.picking')
-
- pick=picking_obj.browse(cr, uid, data['id'])
- if pick.loc_move_id:
- usage=pick.loc_move_id.usage
- else:
+ usage = 'customer'
+ pick = picking_obj.browse(cr, uid, data['id'], context)
+ if pick.move_lines:
usage=pick.move_lines[0].location_id.usage
if pick.type == 'out' and usage == 'supplier':
diff --git a/addons/stock/wizard/wizard_return.py b/addons/stock/wizard/wizard_return.py
index f7cb92639b4..49a41d9c201 100644
--- a/addons/stock/wizard/wizard_return.py
+++ b/addons/stock/wizard/wizard_return.py
@@ -84,12 +84,9 @@ def _create_returns(self, cr, uid, data, context):
else:
new_type='internal'
new_picking=pick_obj.copy(cr, uid, pick.id, {'name':'%s (return)' % pick.name,
- 'move_lines':[], 'state':'draft', 'type':new_type, 'loc_move_id':False,
+ 'move_lines':[], 'state':'draft', 'type':new_type,
'date':date_cur, 'invoice_state':data['form']['invoice_state'],})
- if pick.loc_move_id:
- new_location=pick.loc_move_id.id
- else:
- new_location=move.location_dest_id.id
+ new_location=move.location_dest_id.id
new_move=move_obj.copy(cr, uid, move.id, {
'product_qty': data['form']['return%s' % move.id],
diff --git a/addons/stock_location/__terp__.py b/addons/stock_location/__terp__.py
index 197eecedd76..cc9aaf3b24b 100644
--- a/addons/stock_location/__terp__.py
+++ b/addons/stock_location/__terp__.py
@@ -18,7 +18,9 @@ This module may be usefull for different purposes:
""",
"init_xml" : [],
"demo_xml" : [],
- "update_xml" : ["stock_view.xml"],
+ "update_xml" : ["stock_view.xml",
+ "security/ir.model.access.csv",
+ ],
"active": False,
"installable": True
}
diff --git a/addons/stock_location/i18n/fr_FR.po b/addons/stock_location/i18n/fr_FR.po
index feeacad7461..ab640bcbbed 100644
--- a/addons/stock_location/i18n/fr_FR.po
+++ b/addons/stock_location/i18n/fr_FR.po
@@ -4,16 +4,16 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-11 15:41:43+0000\n"
+"PO-Revision-Date: 2008-09-11 15:41:43+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
#. module: stock_location
#: help:stock.location.path,delay:0
diff --git a/addons/stock_location/security/ir.model.access.csv b/addons/stock_location/security/ir.model.access.csv
new file mode 100644
index 00000000000..e87f65004bb
--- /dev/null
+++ b/addons/stock_location/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_stock_location_path_user","stock location path user","model_stock_location_path","stock.group_stock_user",1,0,0,0
+"access_stock_location_path_manager","stock location path manager","model_stock_location_path","stock.group_stock_manager",1,1,1,1
+"access_stock_location_path_partner_manager","stock.location.path partner manager","model_stock_location_path","product.group_product_manager",1,1,1,1
diff --git a/addons/subscription/i18n/fr_FR.po b/addons/subscription/i18n/fr_FR.po
index a874a674022..a83e30993da 100644
--- a/addons/subscription/i18n/fr_FR.po
+++ b/addons/subscription/i18n/fr_FR.po
@@ -4,94 +4,92 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-11 15:41:43+0000"
-"PO-Revision-Date: 2008-09-11 15:41:43+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
+"Project-Id-Version: OpenERP Server 4.3.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-09-05 13:23+0000\n"
+"PO-Revision-Date: 2008-10-13 17:01+0000\n"
+"Last-Translator: Olivier Laurent \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-10-13 17:44+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: subscription
#: field:subscription.subscription,doc_source:0
#: field:subscription.subscription.history,document_id:0
msgid "Source Document"
-msgstr ""
+msgstr "Document Source"
#. module: subscription
#: field:subscription.subscription,interval_number:0
msgid "Interval Qty"
-msgstr ""
+msgstr "Intervalle (Qté)"
#. module: subscription
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Le nom de l'objet doit démarrer avec x_ et ne pas contenir de charactère "
+"spéciaux !"
#. module: subscription
#: field:subscription.subscription,date_init:0
msgid "First Date"
-msgstr ""
+msgstr "Date de début"
#. module: subscription
#: field:subscription.document.fields,field:0
msgid "Field"
-msgstr ""
+msgstr "Champ"
#. module: subscription
#: model:ir.model,name:subscription.model_subscription_subscription_history
msgid "Subscription history"
-msgstr ""
+msgstr "Historique de l'abonnement"
#. module: subscription
#: selection:subscription.subscription,state:0
msgid "Draft"
-msgstr ""
+msgstr "Brouillon"
#. module: subscription
#: selection:subscription.document.fields,value:0
msgid "Current Date"
-msgstr ""
-
-#. module: subscription
-#, python-format
-#: code:addons/subscription/subscription.py:0
-msgid "Please provide another source document.\nThis one does not exist !"
-msgstr ""
+msgstr "Date du jour"
#. module: subscription
#: selection:subscription.subscription,interval_type:0
msgid "Weeks"
-msgstr ""
+msgstr "Semaines"
#. module: subscription
#: field:subscription.subscription,state:0
msgid "Status"
-msgstr ""
+msgstr "État"
#. module: subscription
#: model:ir.ui.menu,name:subscription.next_id_45
#: view:subscription.subscription:0
msgid "Subscriptions"
-msgstr ""
+msgstr "Abonnements"
#. module: subscription
#: field:subscription.document,model:0
msgid "Object"
-msgstr ""
+msgstr "Objet"
#. module: subscription
#: view:subscription.subscription:0
msgid "Stop"
-msgstr ""
+msgstr "Arrêter"
#. module: subscription
#: view:subscription.subscription:0
msgid "Set to Draft"
-msgstr ""
+msgstr "Mettre en brouillon"
#. module: subscription
#: model:ir.model,name:subscription.model_subscription_document_fields
@@ -101,27 +99,27 @@ msgstr ""
#. module: subscription
#: selection:subscription.subscription,state:0
msgid "Running"
-msgstr ""
+msgstr "En cours"
#. module: subscription
#: view:subscription.subscription.history:0
msgid "Subscription History"
-msgstr ""
+msgstr "Historique de l'abonnement"
#. module: subscription
#: field:subscription.subscription,user_id:0
msgid "User"
-msgstr ""
+msgstr "Utilisateur"
#. module: subscription
#: field:subscription.subscription,interval_type:0
msgid "Interval Unit"
-msgstr ""
+msgstr "Unité de l'intervale"
#. module: subscription
#: field:subscription.subscription.history,date:0
msgid "Date"
-msgstr ""
+msgstr "Date"
#. module: subscription
#: model:ir.ui.menu,name:subscription.menu_subscription_config
@@ -131,70 +129,70 @@ msgstr "Configuration"
#. module: subscription
#: field:subscription.subscription,exec_init:0
msgid "Number of documents"
-msgstr ""
+msgstr "Nombres de documents"
#. module: subscription
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue"
#. module: subscription
#: selection:subscription.subscription,interval_type:0
msgid "Months"
-msgstr ""
+msgstr "Mois"
#. module: subscription
#: field:subscription.document,name:0
#: field:subscription.subscription,name:0
msgid "Name"
-msgstr ""
+msgstr "Nom"
#. module: subscription
#: field:subscription.document,field_ids:0
msgid "Fields"
-msgstr ""
+msgstr "Champs"
#. module: subscription
#: field:subscription.subscription,notes:0
msgid "Notes"
-msgstr ""
+msgstr "Notes"
#. module: subscription
#: selection:subscription.subscription.history,document_id:0
msgid "Sale Order"
-msgstr ""
+msgstr "Commande de vente"
#. module: subscription
#: model:ir.model,name:subscription.model_subscription_subscription
#: field:subscription.subscription.history,subscription_id:0
msgid "Subscription"
-msgstr ""
+msgstr "Abonnement"
#. module: subscription
#: selection:subscription.subscription,interval_type:0
msgid "Days"
-msgstr ""
+msgstr "Jours"
#. module: subscription
#: field:subscription.document,active:0
#: field:subscription.subscription,active:0
msgid "Active"
-msgstr ""
+msgstr "Actif"
#. module: subscription
#: field:subscription.subscription,cron_id:0
msgid "Cron Job"
-msgstr ""
+msgstr "Planificateur de tâche"
#. module: subscription
#: field:subscription.subscription,partner_id:0
msgid "Partner"
-msgstr ""
+msgstr "Partenaire"
#. module: subscription
#: view:subscription.subscription:0
msgid "Subsription Data"
-msgstr ""
+msgstr "Données de l'Abonnement"
#. module: subscription
#: field:subscription.document.fields,document_id:0
@@ -205,12 +203,12 @@ msgstr ""
#. module: subscription
#: view:subscription.subscription:0
msgid "Process"
-msgstr ""
+msgstr "Processus"
#. module: subscription
#: selection:subscription.document.fields,value:0
msgid "False"
-msgstr ""
+msgstr "Faux"
#. module: subscription
#: model:ir.model,name:subscription.model_subscription_document
@@ -221,18 +219,12 @@ msgstr ""
#: model:ir.actions.act_window,name:subscription.action_subscription_form
#: model:ir.ui.menu,name:subscription.menu_action_subscription_form
msgid "All Subscriptions"
-msgstr ""
+msgstr "Tous les Abonnements"
#. module: subscription
#: model:ir.ui.menu,name:subscription.menu_action_document_form
msgid "Document Types"
-msgstr ""
-
-#. module: subscription
-#, python-format
-#: code:addons/subscription/subscription.py:0
-msgid "Wrong Source Document !"
-msgstr ""
+msgstr "Types de Documents"
#. module: subscription
#: view:subscription.document.fields:0
@@ -242,26 +234,25 @@ msgstr ""
#. module: subscription
#: selection:subscription.subscription,state:0
msgid "Done"
-msgstr ""
+msgstr "Terminer"
#. module: subscription
#: selection:subscription.subscription.history,document_id:0
msgid "Invoice"
-msgstr ""
+msgstr "Facture"
#. module: subscription
#: field:subscription.document.fields,value:0
msgid "Default Value"
-msgstr ""
+msgstr "Valeur par défaut"
#. module: subscription
#: field:subscription.subscription,doc_lines:0
#: view:subscription.subscription:0
msgid "Documents created"
-msgstr ""
+msgstr "Document crée"
#. module: subscription
#: model:ir.ui.menu,name:subscription.menu_tools
msgid "Tools"
-msgstr ""
-
+msgstr "Outils"
| | | |