[[ 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..5076fbaba87 100644
--- a/addons/account/report/account_journal.py
+++ b/addons/account/report/account_journal.py
@@ -59,7 +59,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.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)
# 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/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.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..6d7f7a9bf16 100755
--- a/addons/account/report/third_party_ledger.py
+++ b/addons/account/report/third_party_ledger.py
@@ -79,6 +79,54 @@ class third_party_ledger(rml_parse.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
-
+
@@ -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/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..18183dd0313 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -4,15 +4,17 @@
"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_partner_manager","account.account partner manager","model_account_account","base.group_user",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 +26,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,9 +50,12 @@
"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_group_invoice","account.invoice group invoice","model_account_invoice","account.group_account_invoice",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
@@ -62,3 +64,18 @@
"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_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.fiscal.position all","model_account_fiscal_position","base.group_user",1,0,0,0
+"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/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_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..2fc73c68649
--- /dev/null
+++ b/addons/account_report/report/print_indicator.py
@@ -0,0 +1,266 @@
+
+# -*- 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
+ dirname ='Temp_images'
+ path=os.path.join(tools.config['root_path'],dirname,"Image")
+
+ if not os.path.isdir(tools.config['root_path']+ "/"+dirname + '/'):
+ os.mkdir(tools.config['root_path'] +"/"+ dirname + '/')
+ os.path.join(tools.config['root_path'],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 @@
-
-
+
diff --git a/addons/membership/security/ir.model.access.csv b/addons/membership/security/ir.model.access.csv
index a641bd47522..5b34e98dec5 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","base.group_user",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 9b262401975..342a4ff7d4e 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1004,9 +1004,7 @@ class mrp_procurement(osv.osv):
[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)
+ taxep = partner.property_account_position and partner.property_account_position.account_supplier_tax
if not taxep or not taxep.id:
taxes_ids = [x.id for x in procurement.product_id.product_tmpl_id.supplier_taxes_id]
else:
diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml
index cc35b509d5a..514da6d7d6f 100644
--- a/addons/mrp/mrp_wizard.xml
+++ b/addons/mrp/mrp_wizard.xml
@@ -1,22 +1,13 @@
-
- Compute All Schedulers
- mrp.procurement.compute.all
-
+
-
- Compute Procurements Only
- mrp.procurement.compute
-
+
-
- Compute Stock Minimum Rules Only
- mrp.procurement.orderpoint.compute
-
+
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/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/product.py b/addons/product/product.py
index b3a9f77dc41..3b1b78b7241 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -531,6 +531,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."),
@@ -559,6 +560,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 ad359628958..30b07fe8f74 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -121,6 +121,7 @@
|
-
+
|
- [[ 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/sale.py b/addons/sale/sale.py
index 3bbc650816b..be89c2dbd73 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -288,10 +288,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={}):
@@ -451,7 +450,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={}):
@@ -460,6 +460,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':
@@ -475,6 +477,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):
@@ -721,6 +725,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,
@@ -836,10 +841,8 @@ class sale_order_line(osv.osv):
[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)
+ partner = partner_obj.browse(cr, uid, partner_id)
+ taxep = partner.property_account_position and partner.property_account_position.account_tax
if not taxep or not taxep.id:
result['tax_id'] = [x.id for x in product_obj.taxes_id]
else:
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/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_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/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_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/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..f7f37830edb 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -323,11 +323,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 +338,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={}):
@@ -595,7 +600,6 @@ class stock_picking(osv.osv):
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()
@@ -622,10 +626,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:
@@ -650,7 +652,8 @@ class stock_picking(osv.osv):
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 +669,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 +696,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,
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"
| | | | |