|
- Code / Date
+ Code / Date
|
J.C. / Move name
@@ -214,12 +215,10 @@
|
-
-
-
+ Total :
|
- Total:
+
|
[[ '%.2f' % (sum_debit(objects,data['form']['date1'],data['form']['date2']) or 0.0) ]]
@@ -240,7 +239,7 @@
|
- [[ o.code ]]
+ [[ o.code ]]
|
[[ o.complete_name ]]
@@ -262,43 +261,40 @@
|
- [[ 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'] ]]
|
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/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.rml b/addons/account/report/account_tax_code.rml
index f6295bc7368..c33827bf559 100644
--- a/addons/account/report/account_tax_code.rml
+++ b/addons/account/report/account_tax_code.rml
@@ -90,8 +90,6 @@
-
- [[ repeatIn(objects, 'o') ]]
+ [[ 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..e42d0368d70 100755
--- a/addons/account/report/general_ledger.rml
+++ b/addons/account/report/general_ledger.rml
@@ -16,7 +16,7 @@
[[ company.name ]]
- General Ledger
+ General Ledger - [[ company.currency_id.name ]]
diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml
index 439dff350bb..a2f17d7a640 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 ]]
diff --git a/addons/account/report/partner_balance.py b/addons/account/report/partner_balance.py
index e7313354aea..d7e82431ce4 100644
--- a/addons/account/report/partner_balance.py
+++ b/addons/account/report/partner_balance.py
@@ -229,18 +229,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'])
+ print"====i = 0 :completearray====",completearray,i
completearray.append(r)
#
tot_debit = r['debit']
@@ -252,21 +253,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 +286,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 +303,10 @@ class partner_balance(report_sxw.rml_parse):
r['balance'] = float(r['sdebit']) - float(r['scredit'])
#
completearray.append(r)
+ print"====i!=0 completearray====",completearray,i
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 +317,11 @@ class partner_balance(report_sxw.rml_parse):
#
r['balance'] = float(r['sdebit']) - float(r['scredit'])
#
+
completearray.append(r)
+
i = i + 1
+
return completearray
@@ -443,17 +455,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,6 +486,7 @@ class partner_balance(report_sxw.rml_parse):
'AND l.reconcile_id IS NULL ' \
'GROUP BY partner_id',
(self.date_lst[0],))
+
if self.cr.fetchone() != None:
result_tmp = float(self.cr.fetchone()[0])
else:
@@ -486,9 +503,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..8eaf6ec5688 100644
--- a/addons/account/report/partner_balance.rml
+++ b/addons/account/report/partner_balance.rml
@@ -16,22 +16,22 @@
[[ 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']) ]]
-
+ Partner 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
-
+
1cm 27.7cm 20cm 27.7cm
-
+
@@ -55,9 +55,13 @@
-
-
-
+
+
+
+
+
+
+
@@ -76,7 +80,7 @@
-
+
@@ -86,14 +90,15 @@
-
-
+
+
-
-
+
+
+
@@ -105,56 +110,8 @@
-
-
-
- |
- 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
@@ -163,46 +120,73 @@
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'] ]]
+ 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('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['name'] ]]
+ |
+
+ [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['debit'] or '0.0' ]]
+ |
+
+ [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['credit'] or '0.0' ]]
+ |
+
+ [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['balance'] or '0.0' ]]
+ |
+
+ [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['enlitige'] or '0.0' ]]
|
-
-
-
-
-
-
-
-
+
-
+
\ No newline at end of file
diff --git a/addons/board/i18n/fr_FR.po b/addons/board/i18n/fr_FR.po
index 7a2aca08278..c324587edbd 100644
--- a/addons/board/i18n/fr_FR.po
+++ b/addons/board/i18n/fr_FR.po
@@ -2,7 +2,6 @@
# This file containt the translation of the following modules:
# * board
#
-
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0\n"
@@ -19,11 +18,8 @@ msgstr ""
#. module: board
#: 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 !"
+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: board
#: model:ir.model,name:board.model_board_board
diff --git a/addons/board_project/i18n/fr_FR.po b/addons/board_project/i18n/fr_FR.po
index cd45ff75fba..45e6cae41ee 100644
--- a/addons/board_project/i18n/fr_FR.po
+++ b/addons/board_project/i18n/fr_FR.po
@@ -2,7 +2,6 @@
# This file containt the translation of the following modules:
# * board_project
#
-
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0\n"
diff --git a/addons/hr_timesheet_sheet/i18n/fr_FR.po b/addons/hr_timesheet_sheet/i18n/fr_FR.po
index 14ebc208952..9b5c9328e75 100644
--- a/addons/hr_timesheet_sheet/i18n/fr_FR.po
+++ b/addons/hr_timesheet_sheet/i18n/fr_FR.po
@@ -18,7 +18,6 @@ msgstr ""
#~ msgid "Configuration"
#~ msgstr "Configuration"
-
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet.account:0
msgid "Timesheet by Accounts"
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0f518ab67b2..517c8d8dad5 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -116,7 +116,7 @@
[('state','=','open')]
-
+
Template projects
@@ -125,6 +125,7 @@
[('state','=','template')]
+
@@ -184,7 +185,7 @@
My projects
project.project
tree
- [('manager', '=', uid)]
+ [('parent_id','=',False),('manager', '=', uid)]
@@ -194,7 +195,7 @@
My unclosed projects
project.project
tree
- [('manager', '=', uid),('state','<>','cancelled'),('state','<>','done')]
+ [('parent_id','=',False),('manager', '=', uid),('state','<>','cancelled'),('state','<>','done')]
@@ -204,7 +205,7 @@
My open projects
project.project
tree
- [('manager', '=', uid),('state','=','open')]
+ [('parent_id','=',False),('manager', '=', uid),('state','=','open')]
diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index 86fb8008807..8b84e34d18d 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -235,8 +235,8 @@
[[ 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 '' ]]
|
@@ -278,7 +278,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 ]]
@@ -395,3 +395,4 @@
+
| | | | | | | | |