- [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]
+ [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]
diff --git a/addons/account/report/general_journal.py b/addons/account/report/general_journal.py
index 8899977e17a..621f870361c 100644
--- a/addons/account/report/general_journal.py
+++ b/addons/account/report/general_journal.py
@@ -66,38 +66,73 @@ class journal_print(report_sxw.rml_parse):
return not res
filtered_objs = filter(filter_unique, journal_period_objs)
return map(lambda x: x.period_id, filtered_objs)
-
- def lines(self, period_id):
+
+ def lines(self, period_id, journal_id=[]):
+ if type(period_id)==type([]):
+ ids_final = []
+ for journal in journal_id:
+ for period in period_id:
+ ids_journal_period = self.pool.get('account.journal.period').search(self.cr,self.uid, [('journal_id','=',journal),('period_id','=',period)])
+ if ids_journal_period:
+ ids_final.append(ids_journal_period[0])
+ data_jour_period = self.pool.get('account.journal.period').browse(self.cr, self.uid, ids_final)
+ lines_data = []
+ periods = []
+ for data in data_jour_period:
+ if not data.period_id.id in periods:
+ periods.append(data.period_id.id)
+ for period in periods:
+ period_data = self.pool.get('account.period').browse(self.cr, self.uid, period)
+ self.cr.execute('select j.code, j.name, sum(l.debit) as debit, sum(l.credit) as credit from account_move_line l left join account_journal j on (l.journal_id=j.id) where period_id=%d and journal_id in (' + ','.join(map(str, journal_id)) + ') and l.state<>\'draft\' group by j.id, j.code, j.name', (period,))
+ res = self.cr.dictfetchall()
+ res[0].update({'period_name':period_data.name})
+ res[0].update({'pid':period})
+ lines_data.append(res)
+ return lines_data
if not self.journal_ids:
return []
self.cr.execute('select j.code, j.name, sum(l.debit) as debit, sum(l.credit) as credit from account_move_line l left join account_journal j on (l.journal_id=j.id) where period_id=%d and journal_id in (' + self.journal_ids + ') and l.state<>\'draft\' group by j.id, j.code, j.name', (period_id,))
- return self.cr.dictfetchall()
-
- def _sum_debit_period(self, period_id):
+ res = self.cr.dictfetchall()
+ return res
+
+ def _sum_debit_period(self, period_id,journal_id=None):
+ if type(journal_id)==type([]):
+ self.cr.execute('select sum(debit) from account_move_line where period_id=%d and journal_id in (' + ','.join(map(str, journal_id)) + ') and state<>\'draft\'', (period_id,))
+ return self.cr.fetchone()[0] or 0.0
if not self.journal_ids:
return 0.0
self.cr.execute('select sum(debit) from account_move_line where period_id=%d and journal_id in (' + self.journal_ids + ') and state<>\'draft\'', (period_id,))
+
return self.cr.fetchone()[0] or 0.0
-
- def _sum_credit_period(self, period_id):
+
+ def _sum_credit_period(self, period_id,journal_id=None):
+ if type(journal_id)==type([]):
+ self.cr.execute('select sum(credit) from account_move_line where period_id=%d and journal_id in (' + ','.join(map(str, journal_id)) + ') and state<>\'draft\'', (period_id,))
+ return self.cr.fetchone()[0] or 0.0
if not self.journal_ids:
return 0.0
self.cr.execute('select sum(credit) from account_move_line where period_id=%d and journal_id in (' + self.journal_ids + ') and state<>\'draft\'', (period_id,))
return self.cr.fetchone()[0] or 0.0
-
- def _sum_debit(self):
+
+ def _sum_debit(self,period_id=None,journal_id=None):
+ if type(period_id)==type([]):
+ self.cr.execute('select sum(debit) from account_move_line where period_id in (' + ','.join(map(str, period_id)) + ') and journal_id in (' + ','.join(map(str, journal_id)) + ') and state<>\'draft\'')
+ return self.cr.fetchone()[0] or 0.0
if not self.journal_ids or not self.period_ids:
return 0.0
self.cr.execute('select sum(debit) 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
-
- def _sum_credit(self):
+
+ def _sum_credit(self,period_id=None,journal_id=None):
+ if type(period_id)==type([]):
+ self.cr.execute('select sum(credit) from account_move_line where period_id in (' + ','.join(map(str, period_id)) + ') and journal_id in (' + ','.join(map(str, journal_id)) + ') and state<>\'draft\'')
+ return self.cr.fetchone()[0] or 0.0
if not self.journal_ids or not self.period_ids:
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, header=False)
-
+report_sxw.report_sxw('report.account.general.journal.wiz', 'account.journal.period', 'addons/account/report/wizard_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 f89c7d201b6..d7775dd3cbb 100644
--- a/addons/account/report/general_journal.rml
+++ b/addons/account/report/general_journal.rml
@@ -82,13 +82,13 @@
-
+
-
-
+
+
@@ -130,7 +130,7 @@
Printing Date :
- [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]
+ [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]
diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py
index f4ff9f9ef45..e00a594f95f 100755
--- a/addons/account/report/general_ledger.py
+++ b/addons/account/report/general_ledger.py
@@ -32,6 +32,7 @@ from report import report_sxw
import xml
import rml_parse
import pooler
+from osv import osv
class general_ledger(rml_parse.rml_parse):
_name = 'report.account.general.ledger'
@@ -40,7 +41,11 @@ class general_ledger(rml_parse.rml_parse):
def preprocess(self, objects, data, ids):
##
+
+
self.borne_date = self.get_min_date(data['form'])
+
+
##
new_ids = []
if (data['model'] == 'account.account'):
@@ -54,6 +59,7 @@ class general_ledger(rml_parse.rml_parse):
def __init__(self, cr, uid, name, context):
super(general_ledger, self).__init__(cr, uid, name, context)
+ self.date_borne = {}
self.query = ""
self.child_ids = ""
self.tot_currency = 0.0
@@ -109,6 +115,7 @@ class general_ledger(rml_parse.rml_parse):
return result
def get_children_accounts(self, account, form):
+
self.child_ids = self.pool.get('account.account').search(self.cr, self.uid,
[('parent_id', 'child_of', self.ids)])
res = []
@@ -116,21 +123,25 @@ class general_ledger(rml_parse.rml_parse):
## We will make the test for period or date
## We will now make the test
#
- if form.has_key('fiscalyear'):
+ if form.has_key('fiscalyear'):
ctx['fiscalyear'] = form['fiscalyear']
ctx['periods'] = form['periods'][0][2]
else:
ctx['date_from'] = form['date_from']
ctx['date_to'] = form['date_to']
- ##
+#
#
self.query = self.pool.get('account.move.line')._query_get(self.cr, self.uid, context=ctx)
+
for child_id in self.pool.get('account.account').search(self.cr, self.uid,
[('parent_id', 'child_of', [account.id])]):
+
child_account = self.pool.get('account.account').browse(self.cr, self.uid, child_id)
+
sold_account = self._sum_solde_account(child_account,form)
self.sold_accounts[child_account.id] = sold_account
+
if form['display_account'] == 'bal_mouvement':
if child_account.type != 'view' \
and len(self.pool.get('account.move.line').search(self.cr, self.uid,
@@ -153,16 +164,24 @@ class general_ledger(rml_parse.rml_parse):
res.append(child_account)
##
- if form['soldeinit']:
- ## We will now compute solde initiaux
+
+
+ ## We will now compute solde initiaux
+ if not len(res):
+ return[account]
+ else:
for move in res:
- SOLDEINIT = "SELECT sum(l.debit) AS sum_debit, sum(l.credit) AS sum_credit FROM account_move_line l WHERE l.account_id = " + str(move.id) + " AND l.date < '" + self.borne_date['max_date'] + "'" + " AND l.date > '" + self.borne_date['min_date'] + "'"
+
+ SOLDEINIT = "SELECT sum(l.debit) AS sum_debit, sum(l.credit) AS sum_credit FROM account_move_line l WHERE l.account_id = " + str(move.id) + " AND l.date <= '" + self.borne_date['max_date'] + "'" + " AND l.date >= '" + self.borne_date['min_date'] + "'"
self.cr.execute(SOLDEINIT)
- resultat = self.cr.dictfetchall()
+ resultat = self.cr.dictfetchall()
+
if resultat[0] :
+
if resultat[0]['sum_debit'] == None:
sum_debit = 0
else:
+
sum_debit = resultat[0]['sum_debit']
if resultat[0]['sum_credit'] == None:
sum_credit = 0
@@ -175,47 +194,83 @@ class general_ledger(rml_parse.rml_parse):
else:
move.init_credit = 0
move.init_debit = 0
-
+
##
+
return res
def get_min_date(self,form):
+
## Get max born from account_fiscal year
#
- sql = """ select min(fy.date_start) from account_fiscalyear
+ sql = """ select min(fy.date_start) as start_date,max(fy.date_stop) as stop_date from account_fiscalyear
As fy where fy.state <> 'close'
"""
self.cr.execute(sql)
res = self.cr.dictfetchall()
- borne_min = res[0]['min']
- #
- ##
- if form.has_key('fiscalyear'):
+ borne_min = res[0]['start_date']
+ borne_max = res[0]['stop_date']
+ if form['state'] == 'byperiod':
## This function will return the most aged date
periods = form['periods'][0][2]
if not periods:
sql = """
- Select min(p.date_start) from account_period as p where p.fiscalyear_id = """ + str(form['fiscalyear']) + """
+ Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = """ + str(form['fiscalyear']) + """
"""
else:
periods_id = ','.join(map(str, periods))
sql = """
- Select min(p.date_start) from account_period as p where p.id in ( """ + periods_id + """)
+ Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id in ( """ + periods_id + """)
"""
self.cr.execute(sql)
res = self.cr.dictfetchall()
- borne_max = res[0]['min']
- else:
- borne_max = form['date_from']
- date_borne = {
+ borne_min = res[0]['start_date']
+ borne_max = res[0]['stop_date']
+ elif form['state'] == 'bydate':
+ borne_min = form['date_from']
+ borne_max = form['date_to']
+ elif form['state'] == 'all':
+ periods = form['periods'][0][2]
+ if not periods:
+ sql = """
+ Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = """ + str(form['fiscalyear']) + """
+ """
+ else:
+ periods_id = ','.join(map(str, periods))
+ sql = """
+ Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id in ( """ + periods_id + """)
+ """
+ self.cr.execute(sql)
+ res = self.cr.dictfetchall()
+ period_min = res[0]['start_date']
+ period_max = res[0]['stop_date']
+ date_min = form['date_from']
+ date_max = form['date_to']
+ if period_min='%s'
+ ORDER by %s"""%(account.id,self.query,self.date_borne['max_date'],self.date_borne['min_date'],sorttag)
+
self.cr.execute(sql)
- res = self.cr.dictfetchall()
+
+ res = self.cr.dictfetchall()
+
sum = 0.0
account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
for l in res:
diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml
index e42d0368d70..17b9adccd4f 100755
--- a/addons/account/report/general_ledger.rml
+++ b/addons/account/report/general_ledger.rml
@@ -23,7 +23,7 @@
[[ time.strftime("%d-%m-%Y %H:%M", time.localtime()) ]]Page
-
+
1cm 27.7cm 20cm 27.7cm
@@ -32,29 +32,28 @@
-
+
-
+
-
-
+
-
+
-
+
-
-
+
+
-
-
+
+
@@ -91,247 +90,89 @@
- [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+
+ [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+
+
+
+
+
+
+ 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.
+
+
+
+
- [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['name'] ]]
+ [[ 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 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['debit'] or '0.0' ]]
+
+ [[ (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 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['credit'] 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 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['balance'] 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 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['enlitige'] 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' ]]
+
+ [[ l['debit'] and ('%.2f' % l['debit']) or '' ]]
+
+
+ [[ l['credit'] and ('%.2f' % l['credit']) or '' ]]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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..d231315c175 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -4,15 +4,19 @@
"access_account_account_type","account.account.type","model_account_account_type","account.group_account_user",1,0,0,0
"access_account_tax","account.tax","model_account_tax","account.group_account_user",1,0,0,0
"access_account_account","account.account","model_account_account","account.group_account_user",1,0,0,0
+"access_account_account_user","account.account user","model_account_account","base.group_user",1,0,0,0
+"access_account_account_partner_manager","account.account partner manager","model_account_account","base.group_partner_manager",1,0,0,0
"access_account_journal_view","account.journal.view","model_account_journal_view","account.group_account_user",1,0,0,0
"access_account_journal_column","account.journal.column","model_account_journal_column","account.group_account_user",1,0,0,0
"access_account_journal","account.journal","model_account_journal","account.group_account_user",1,0,0,0
"access_account_period","account.period","model_account_period","account.group_account_user",1,0,0,0
+"access_account_journal_period_manager","account.journal.period manager","model_account_journal_period","account.group_account_manager",1,1,1,1
"access_account_journal_period","account.journal.period","model_account_journal_period","account.group_account_user",1,1,1,1
"access_account_move","account.move","model_account_move","account.group_account_user",1,1,1,1
+"access_account_move_line","account.move.line","model_account_move_line","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 +28,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_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_line_uinvoice","account.move.line invoice","model_account_move_line","account.group_account_invoice",1,1,1,1
+"access_account_move_reconcile_uinvoice","account.move.reconcile","model_account_move_reconcile","account.group_account_invoice",1,1,1,1
+"access_account_journal_period_uinvoice","account.journal.period","model_account_journal_period","account.group_account_invoice",1,1,1,1
"access_account_payment_term_manager","account.payment.term","model_account_payment_term","account.group_account_manager",1,1,1,1
"access_account_payment_term_line_manager","account.payment.term.line","model_account_payment_term_line","account.group_account_manager",1,1,1,1
"access_account_account_type_manager","account.account.type","model_account_account_type","account.group_account_manager",1,1,1,1
@@ -51,14 +52,29 @@
"access_account_journal_view_manager","account.journal.view","model_account_journal_view","account.group_account_manager",1,1,1,1
"access_account_journal_column_manager","account.journal.column","model_account_journal_column","account.group_account_manager",1,1,1,1
"access_account_journal_manager","account.journal","model_account_journal","account.group_account_manager",1,1,1,1
+"access_account_journal_invoice","account.journal invoice","model_account_journal","account.group_account_invoice",1,0,0,0
"access_account_period_manager","account.period","model_account_period","account.group_account_manager",1,1,1,1
+"access_account_period_invoice","account.period invoice","model_account_period","account.group_account_invoice",1,0,0,0
"access_account_tax_code_manager","account.tax.code","model_account_tax_code","account.group_account_manager",1,1,1,1
"access_account_tax_manager","account.tax","model_account_tax","account.group_account_manager",1,1,1,1
-"access_account_invoice_manager","account.invoice","model_account_invoice","account.group_account_manager",1,1,1,1
-"access_account_invoice_line_manager","account.invoice.line","model_account_invoice_line","account.group_account_manager",1,1,1,1
-"access_account_invoice_tax_manager","account.invoice.tax","model_account_invoice_tax","account.group_account_manager",1,1,1,1
+"access_account_invoice_group_invoice","account.invoice group invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
"access_account_analytic_account_manager","account.analytic.account","model_account_analytic_account","account.group_account_manager",1,1,1,1
"access_account_analytic_journal_manager","account.analytic.journal","model_account_analytic_journal","account.group_account_manager",1,1,1,1
"access_account_fiscalyear","account.fiscalyear","model_account_fiscalyear","account.group_account_manager",1,1,1,1
"access_account_fiscalyear_user","account.fiscalyear.user","model_account_fiscalyear","account.group_account_user",1,0,0,0
"access_account_fiscalyear_invoice","account.fiscalyear.invoice","model_account_fiscalyear","account.group_account_invoice",1,0,0,0
+"access_res_currency_account_manager","res.currency account manager","base.model_res_currency","group_account_manager",1,1,1,1
+"access_res_currency_rate_account_manager","res.currency.rate account manager","base.model_res_currency_rate","group_account_manager",1,1,1,1
+"access_account_config_wizard_account_manager","account.config.wizard account manager","model_account_config_wizard","group_account_manager",1,1,1,1
+"access_account_config_wizard_system_manager","account.config.wizard system manager","model_account_config_wizard","base.group_system",1,1,1,1
+"access_account_invoice_user","account.invoice user","model_account_invoice","base.group_user",1,0,0,0
+"access_account_invoice_user","account.invoice.line user","model_account_invoice_line","base.group_user",1,0,0,0
+"access_account_invoice_user","account.invoice.tax user","model_account_invoice_tax","base.group_user",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/__init__.py b/addons/account/wizard/__init__.py
index 6ecd2040756..aa26e3f8e9d 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -64,6 +64,9 @@ import wizard_use_model
import wizard_state_open
import wizard_statement_from_invoice
+import wizard_print_journal
+import wizard_central_journal
+import wizard_general_journal
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/wizard_account_balance_report.py b/addons/account/wizard/wizard_account_balance_report.py
index 431e183f156..d02907f72cc 100644
--- a/addons/account/wizard/wizard_account_balance_report.py
+++ b/addons/account/wizard/wizard_account_balance_report.py
@@ -30,41 +30,48 @@ import wizard
import pooler
import time
-report_type = '''
-'''
-
-
-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')]}
-}
-
-
period_form = '''
'''
-
-
period_fields = {
- 'fiscalyear': {'string': 'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
- 'help': 'Keep empty for all open fiscal year'},
+ 'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
+ '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'},
- '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':"Display accounts ",'type':'selection','selection':[('bal_mouvement','With Movements'),('bal_solde','With Balance != 0'),('bal_all','All')]},
+ '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')},
}
account_form = '''
@@ -76,9 +83,14 @@ account_fields = {
'Account_list': {'string':'Account', 'type':'many2one', 'relation':'account.account', 'required':True ,'domain':[('parent_id','=',False)]},
}
-
class wizard_report(wizard.interface):
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]
+ data['form']['company_id'] = company_id
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)
@@ -86,17 +98,20 @@ class wizard_report(wizard.interface):
data['form']['display_account']='bal_all'
return data['form']
- def _get_defaults_fordate(self, cr, uid, data, context):
- data['form']['display_account']='bal_all'
+ def _check_state(self, cr, uid, data, context):
+
+ if data['form']['state'] == 'bydate':
+ self._check_date(cr, uid, data, context)
+ data['form']['fiscalyear'] = 0
+ else :
+ data['form']['fiscalyear'] = 1
return data['form']
-
-
+
def _check_path(self, cr, uid, data, context):
if data['model'] == 'account.account':
- return 'checktype'
+ return 'checktype'
else:
- return 'account_selection'
-
+ return 'account_selection'
def _check_date(self, cr, uid, data, context):
sql = """
@@ -108,7 +123,6 @@ class wizard_report(wizard.interface):
raise wizard.except_wizard('UserError','Date to must be set between ' + res[0]['date_start'] + " and " + res[0]['date_stop'])
else:
return 'report'
-
else:
raise wizard.except_wizard('UserError','Date not in a defined fiscal year')
@@ -123,27 +137,12 @@ class wizard_report(wizard.interface):
'result': {'type':'form', 'arch':account_form,'fields':account_fields, 'state':[('end','Cancel'),('checktype','Print')]}
},
'checktype': {
- '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.account.balance', 'state':'end'}
}
}
wizard_report('account.account.balance.report')
-
-
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_central_journal.py b/addons/account/wizard/wizard_central_journal.py
new file mode 100644
index 00000000000..db4002bc084
--- /dev/null
+++ b/addons/account/wizard/wizard_central_journal.py
@@ -0,0 +1,60 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+import wizard
+import pooler
+
+form = '''
+'''
+
+fields = {
+ 'journal_id': {'string': 'Journal', 'type': 'many2many', 'relation': 'account.journal', 'required': True},
+ 'period_id': {'string': 'Period', 'type': 'many2many', 'relation': 'account.period', 'required': True},
+}
+
+
+class wizard_print_journal(wizard.interface):
+ states = {
+ 'init': {
+ 'actions': [],
+ 'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel'), ('print', 'Print'))},
+ },
+ 'print': {
+ 'actions': [],
+ 'result': {'type':'print', 'report':'account.central.journal.wiz', 'state':'end'},
+ },
+ }
+wizard_print_journal('account.central.journal.report')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account/wizard/wizard_general_journal.py b/addons/account/wizard/wizard_general_journal.py
new file mode 100644
index 00000000000..5b72a944ea1
--- /dev/null
+++ b/addons/account/wizard/wizard_general_journal.py
@@ -0,0 +1,60 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+import wizard
+import pooler
+
+form = '''
+'''
+
+fields = {
+ 'journal_id': {'string': 'Journal', 'type': 'many2many', 'relation': 'account.journal', 'required': True},
+ 'period_id': {'string': 'Period', 'type': 'many2many', 'relation': 'account.period', 'required': True},
+}
+
+
+class wizard_print_journal(wizard.interface):
+ states = {
+ 'init': {
+ 'actions': [],
+ 'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel'), ('print', 'Print'))},
+ },
+ 'print': {
+ 'actions': [],
+ 'result': {'type':'print', 'report':'account.general.journal.wiz', 'state':'end'},
+ },
+ }
+wizard_print_journal('account.general.journal.report')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account/wizard/wizard_general_ledger_report.py b/addons/account/wizard/wizard_general_ledger_report.py
index c4a2f2a7438..2ba3b2b0a1f 100644
--- a/addons/account/wizard/wizard_general_ledger_report.py
+++ b/addons/account/wizard/wizard_general_ledger_report.py
@@ -29,64 +29,94 @@ import pooler
import locale
import time
-report_type = '''
-'''
-
-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')},
- 'sortbydate':{'string':"Sort by",'type':'selection','selection':[('sort_date','Date'),('sort_mvt','Mouvement')]},
- 'display_account':{'string':"Display accounts ",'type':'selection','selection':[('bal_mouvement','With movements'),('bal_all','All'),('bal_solde','With balance is not equal to 0')]},
- 'landscape':{'string':"Print in Landscape Mode",'type':'boolean'},
- 'soldeinit':{'string':"Inclure les soldes initiaux",'type':'boolean'},
- 'amount_currency':{'string':"with amount in currency",'type':'boolean'}
-
-}
+#report_type = '''
+#'''
+#
+#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')},
+# 'sortbydate':{'string':"Sort by",'type':'selection','selection':[('sort_date','Date'),('sort_mvt','Mouvement')]},
+# 'display_account':{'string':"Display accounts ",'type':'selection','selection':[('bal_mouvement','With movements'),('bal_all','All'),('bal_solde','With balance is not equal to 0')]},
+# 'landscape':{'string':"Print in Landscape Mode",'type':'boolean'},
+# 'soldeinit':{'string':"Inclure les soldes initiaux",'type':'boolean'},
+# 'amount_currency':{'string':"with amount in currency",'type':'boolean'}
+#
+#}
account_form = '''
-'''
account_fields = {
- 'Account_list': {'string':'Account', 'type':'many2one', 'relation':'account.account', 'required':True ,'domain':[('parent_id','=',False)]},
+ 'Account_list': {'string':'Chart of Accounts', 'type':'many2one', 'relation':'account.account', 'required':True ,'domain':[('parent_id','=',False)]},
}
-
-
-
period_form = '''
-'''
period_fields = {
+ 'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
+ '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'},
'sortbydate':{'string':"Sort by:",'type':'selection','selection':[('sort_date','Date'),('sort_mvt','Mouvement')]},
'display_account':{'string':"Display accounts ",'type':'selection','selection':[('bal_mouvement','With movements'),('bal_all','All'),('bal_solde','With balance is not equal to 0')]},
- 'landscape':{'string':"Print in Landscape Mode",'type':'boolean'},
+ 'landscape':{'string':"Landscape Mode",'type':'boolean'},
'soldeinit':{'string':"Inclure les soldes initiaux",'type':'boolean'},
- 'amount_currency':{'string':"with amount in currency",'type':'boolean'}
+ 'amount_currency':{'string':"With Currency",'type':'boolean'},
+ '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')},
+
}
def _check_path(self, cr, uid, data, context):
if data['model'] == 'account.account':
@@ -101,6 +131,7 @@ def _check(self, cr, uid, data, context):
return 'report'
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']['date_from'])
cr.execute(sql)
@@ -113,24 +144,36 @@ def _check_date(self, cr, uid, data, context):
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'] == 'bydate':
+ _check_date(self, cr, uid, data, context)
+ data['form']['fiscalyear'] = 0
+ else :
+
+ data['form']['fiscalyear'] = 1
+ return data['form']
class wizard_report(wizard.interface):
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]
+ data['form']['company_id'] = company_id
fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
+
data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
+ 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']['sortbydate'] = 'sort_date'
data['form']['display_account']='bal_all'
data['form']['landscape']=True
data['form']['amount_currency'] = True
return data['form']
- def _get_defaults_fordate(self, cr, uid, data, context):
- data['form']['sortbydate'] = 'sort_date'
- data['form']['display_account']='bal_all'
- data['form']['landscape']=True
- data['form']['amount_currency'] = True
- return data['form']
-
states = {
'init': {
@@ -142,31 +185,19 @@ class wizard_report(wizard.interface):
'result': {'type':'form', 'arch':account_form,'fields':account_fields, 'state':[('end','Cancel'),('checktype','Print')]}
},
'checktype': {
- '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'),('checkreport','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}
- },
'checkreport': {
'actions': [],
'result': {'type':'choice','next_state':_check}
},
'report_landscape': {
- 'actions': [],
+ 'actions': [_check_state],
'result': {'type':'print', 'report':'account.general.ledger_landscape', 'state':'end'}
},
'report': {
- 'actions': [],
+ 'actions': [_check_state],
'result': {'type':'print', 'report':'account.general.ledger', 'state':'end'}
}
}
diff --git a/addons/account/wizard/wizard_partner_balance_report.py b/addons/account/wizard/wizard_partner_balance_report.py
index 7334bfc56fc..470e3e23955 100644
--- a/addons/account/wizard/wizard_partner_balance_report.py
+++ b/addons/account/wizard/wizard_partner_balance_report.py
@@ -29,64 +29,57 @@ 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},
- 'state':{'string':"Select Report Type",'type':'selection','selection':[('none','None'),('bydate','By Date'),('byperiod','By Period')],'default': lambda *a:'none' },
- 'fiscalyear': {'string': 'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
- 'help': 'Keep empty for all open fiscal year','states':{'none':[('readonly',True)],'bydate':[('readonly',True)]}},
+ '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':"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')},
+ '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_load(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
@@ -102,30 +95,12 @@ class wizard_report(wizard.interface):
data['form']['result_selection'] = 'all'
return data['form']
- def _get_defaults(self, cr, uid, data, context):
+ def _check_state(self, cr, uid, data, context):
- if data['form']['state'] == 'none':
- return 'report'
- else :
- if data['form']['state'] == 'byperiod':
- data['form']['fiscalyear'] = True
- else :
- self._check_date(cr, uid, data, context)
- data['form']['fiscalyear'] = False
-
+ if data['form']['state'] == 'bydate' :
+ self._check_date(cr, uid, data, context)
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'
-# return data['form']
-
+
def _check_date(self, cr, uid, data, context):
sql = """
@@ -141,27 +116,14 @@ class wizard_report(wizard.interface):
else:
raise wizard.except_wizard('UserError','Date not in a defined fiscal year')
-
states = {
'init': {
- 'actions': [_get_load],
+ 'actions': [_get_defaults],
'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel'),('report','Print')]}
},
-# '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': [_get_defaults],
+ 'actions': [_check_state],
'result': {'type':'print', 'report':'account.partner.balance', 'state':'end'}
}
}
diff --git a/addons/account/wizard/wizard_print_journal.py b/addons/account/wizard/wizard_print_journal.py
new file mode 100644
index 00000000000..c288e096dee
--- /dev/null
+++ b/addons/account/wizard/wizard_print_journal.py
@@ -0,0 +1,68 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+import wizard
+import pooler
+
+form = '''
+'''
+
+fields = {
+ 'journal_id': {'string': 'Journal', 'type': 'many2many', 'relation': 'account.journal', 'required': True},
+ 'period_id': {'string': 'Period', 'type': 'many2many', 'relation': 'account.period', 'required': True},
+ 'sort_selection':{
+ 'string':"Entries Sorted By",
+ 'type':'selection',
+ 'selection':[('date','By date'),('ref','Reference Number')],
+ 'required':True,
+ 'default': lambda *a: 'date',
+ },
+
+}
+
+class wizard_print_journal(wizard.interface):
+ states = {
+ 'init': {
+ 'actions': [],
+ 'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel'), ('print', 'Print'))},
+ },
+ 'print': {
+ 'actions': [],
+ 'result': {'type':'print', 'report':'account.journal.period.print.wiz', 'state':'end'},
+ },
+ }
+wizard_print_journal('account.print.journal.report')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account/wizard/wizard_third_party_ledger.py b/addons/account/wizard/wizard_third_party_ledger.py
index e9f2daf4b01..96720083f53 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_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/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/report/print_indicator.py b/addons/account_report/report/print_indicator.py
index ec0e84fb314..203f249178b 100644
--- a/addons/account_report/report/print_indicator.py
+++ b/addons/account_report/report/print_indicator.py
@@ -32,19 +32,22 @@
import pooler
import time
from report import report_sxw
-from crm.report import report_businessopp
-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 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 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
@@ -78,7 +81,7 @@ class accounting_report_indicator(report_sxw.rml_parse):
if not name=='array':
return super(accounting_report_indicator,self).repeatIn(lst, name, nodes_parent=False)
- value=['X-Axis']
+ value=['Data']
value.extend(self.header_name)
type=['string'].extend(['float']*len(self.header_name))
width=[40]*(len(self.header_name)+1)
@@ -123,18 +126,19 @@ class accounting_report_indicator(report_sxw.rml_parse):
def lines(self,data):
res={}
result=[]
- obj_inds=self.pool.get('account.report.report').browse(self.cr,self.uid,data['indicator_id'])
+ 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
+# 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)
- find_child(obj_inds)
-
- for obj_ind in self.list:
+ for obj_ind in obj_inds:
res = {
'id':obj_ind.id,
'name':obj_ind.name,
@@ -143,10 +147,8 @@ class accounting_report_indicator(report_sxw.rml_parse):
'disp_graph':obj_ind.disp_graph,
'note':obj_ind.note,
'type':obj_ind.type,
- 'last':False,
}
result.append(res)
- result[-1]['last']=True
return result
def getarray(self,data,object):
@@ -156,28 +158,40 @@ class accounting_report_indicator(report_sxw.rml_parse):
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['X-Axis']='Value'
+ res['Data']='Value'
result.append(res)
return result
def test1(self,data,object,intercall=False):
- path=tools.config['root_path']+"/Temp_images/Image"
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=[]
- for item in obj_his:
- data_val.append(item.val)
- data_period.append(item.period_id.name)
+ 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
@@ -218,25 +232,28 @@ class accounting_report_indicator(report_sxw.rml_parse):
# drawing.save(formats=['png'],fnRoot=path+str(self.count),title="helo")
# renderPM.drawToFile(drawing1, 'example1.jpg','jpg')
import os
- dirname ='Temp_images'
- if not os.path.isdir('./' + dirname + '/'):
- os.mkdir('./' + dirname + '/')
- pdf_string = StringIO.StringIO()
- can = canvas.init('Image'+str(self.count)+".png")
- chart_object.set_defaults(line_plot.T, line_style=None)
+ path=tools.config['addons_path']+"/account_report/tmp_images/image"
+
+ dirname =tools.config['addons_path']+'/account_report/tmp_images/'
+ if not os.path.isdir(dirname):
+ os.mkdir(dirname)
+
+ can = canvas.init('image'+str(self.count)+".png")
+# can.clip(0,0,600,400)
+
data=zip(self.header_name,self.header_val)
- ar = area.T(size = (400,200),x_coord = category_coord.T(data, 0), y_range = (0, None),
- x_axis = axis.X(label="Period//Year",format="/a-30{}%s"),
+ 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, label = "Value",fill_style=fill_style.red))
+ 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')
+ 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',
diff --git a/addons/account_report/report/print_indicator.rml b/addons/account_report/report/print_indicator.rml
index 6727812fc6f..6134b48dea1 100644
--- a/addons/account_report/report/print_indicator.rml
+++ b/addons/account_report/report/print_indicator.rml
@@ -3,6 +3,12 @@
+
+
+
+
+
+
@@ -17,90 +23,75 @@
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-Indicators
-
-
-
-
-
-
-
-
-
-[[ company.name ]]
-
-
-
-
-
-
-
-Currency: [[ company.currency_id.name]]
-
-
-
+
+
+
+ Indicators
+
+
+
+
+
+
+ [[ company.name ]]
+
+
+ Currency: [[ company.currency_id.name]]
+
+
+
-Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]
-
+Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]
+
Name
@@ -113,22 +104,23 @@
+[[ 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','fontSize':'10.5'}) ]][[ o['name'] ]]
-[[ o['type']=='view' and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]][[ o['code'] ]]
+[[ o['type']=='view' and setTag('para','para',{'fontName':'Helvetica-Bold','fontSize':'10.5'}) ]][[ o['code'] ]]
-[[ o['disp_graph'] and setTag('para','image',{'file':test(data['form'],o)}) or removeParentNode('para') ]]
+[[ o['disp_graph'] and setTag('para','image',{'width':'450.00','height':'215.00','file':test(data['form'],o)}) or removeParentNode('para') ]]
@@ -139,48 +131,50 @@
-
+
-
+
-
+
-
+
-Expression : [[ o['expression'] ]]
+
+
+
+Expression : [[ o['expression'] ]]
+
+
+
-
+
-Notes : [[ o['note'] ]]
+
+
+
+Notes : [[ o['note'] ]]
+
+
+
-[[ o['last'] and removeParentNode('pageBreak')]]
-
-
-
-Name[[ o['last'] and removeParentNode('blockTable')]]
-
-
-Code
-
-
-
+
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 2870c29e61c..17252e8b3c8 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,},
}
@@ -61,6 +61,11 @@ def _load_base(self, cr, uid, data, context):
next_fields['base_selection']['relation']='account.period'
return data['form']
+def _check_len(self, cr, uid, data, context):
+ if len(data['form']['base_selection'][0][2])>12:
+ raise wizard.except_wizard('User Error!',"Please select maximum 12 records to fit the page-width.")
+ return data['form']
+
class wizard_print_indicators(wizard.interface):
states = {
'init': {
@@ -72,7 +77,7 @@ class wizard_print_indicators(wizard.interface):
'result': {'type':'form', 'arch':next_form, 'fields':next_fields, 'state':[('end','Cancel'),('print','Print')]}
},
'print': {
- 'actions':[],
+ 'actions':[_check_len],
'result' :{'type':'print','report':'print.indicators', 'state':'end'}
}
}
diff --git a/addons/account_voucher/__init__.py b/addons/account_voucher/__init__.py
new file mode 100755
index 00000000000..71118c9f783
--- /dev/null
+++ b/addons/account_voucher/__init__.py
@@ -0,0 +1,3 @@
+import voucher
+import voucher_account
+import report
\ No newline at end of file
diff --git a/addons/account_voucher/__terp__.py b/addons/account_voucher/__terp__.py
new file mode 100755
index 00000000000..97105b77379
--- /dev/null
+++ b/addons/account_voucher/__terp__.py
@@ -0,0 +1,33 @@
+{
+ "name" : "India Accounting",
+ "version" : "1.0",
+ "author" : "Tiny",
+ "description": """
+ India Accounting module includes all the basic requirenment of
+ Basic Accounting, plus new things which available are
+ * Indian Account Chart
+ * New Invoice - (Local, Retail)
+ * Invoice Report
+ * Tax structure
+ * Journals
+ * VAT Declaration report
+ * Accounting Periods
+ """,
+ "category" : "Generic Modules/Accounting",
+ "website" : "http://tinyerp.com",
+ "depends" : ["base", "account"],
+ "init_xml" : [
+ ],
+
+ "demo_xml" : [
+ ],
+
+ "update_xml" : [
+ "account_voucher_sequence.xml",
+ "account_view.xml",
+ "account_report.xml",
+ "voucher_view.xml",
+ ],
+ "active": False,
+ "installable": True
+}
\ No newline at end of file
diff --git a/addons/account_voucher/account_report.xml b/addons/account_voucher/account_report.xml
new file mode 100755
index 00000000000..134581c8816
--- /dev/null
+++ b/addons/account_voucher/account_report.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/account_voucher/account_view.xml b/addons/account_voucher/account_view.xml
new file mode 100755
index 00000000000..572a0d34095
--- /dev/null
+++ b/addons/account_voucher/account_view.xml
@@ -0,0 +1,57 @@
+
+
+
+
+
+ account.form
+
+ account.account
+ form
+
+
+
+
+
+
+
+
+
+
+
+ account.form
+
+ account.account
+ form
+
+
+
+
+
+
+
+ account.form
+
+ account.account
+ form
+
+
+
+
+
+
+
+
+ account.form
+
+ account.account
+ form
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/account_voucher/account_voucher_sequence.xml b/addons/account_voucher/account_voucher_sequence.xml
new file mode 100644
index 00000000000..70e804de8c6
--- /dev/null
+++ b/addons/account_voucher/account_voucher_sequence.xml
@@ -0,0 +1,110 @@
+
+
+
+
+
+ Voucher
+ account.voucher
+
+
+
+
+ Account Cash Received Voucher
+ account.voucher.rec_voucher
+
+
+
+ Account Cash Payble Voucher
+ account.voucher.pay_voucher
+
+
+ Account Bank Received Voucher
+ account.voucher.bank_rec_voucher
+
+
+ Account Bank Payble Voucher
+ account.voucher.bank_pay_voucher
+
+
+ Account Contra Voucher
+ account.voucher.cont_voucher
+
+
+ Account Journal Voucher
+ account.voucher.journal_sale_vou
+
+
+ Account Journal Voucher
+ account.voucher.journal_pur_vou
+
+
+
+
+ Account Cash Received Voucher
+ account.voucher.rec_voucher
+
+ %(year)s/
+
+
+
+ Account Cash Payble Voucher
+ account.voucher.pay_voucher
+
+ %(year)s/
+
+
+ Account Bank Received Voucher
+ account.voucher.bank_rec_voucher
+
+ %(year)s/
+
+
+ Account Bank Payble Voucher
+ account.voucher.bank_pay_voucher
+
+ %(year)s/
+
+
+ Account Contra Voucher
+ account.voucher.cont_voucher
+
+ %(year)s/
+
+
+ Account Journal Voucher
+ account.voucher.journal_sale_vou
+
+ %(year)s/
+
+
+ Account Journal Voucher
+ account.voucher.journal_pur_vou
+
+ %(year)s/
+
+
+
+
+
+
diff --git a/addons/account_voucher/account_voucher_wizard.xml b/addons/account_voucher/account_voucher_wizard.xml
new file mode 100644
index 00000000000..ffe7b25c87c
--- /dev/null
+++ b/addons/account_voucher/account_voucher_wizard.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/account_voucher/account_voucher_workflow.xml b/addons/account_voucher/account_voucher_workflow.xml
new file mode 100644
index 00000000000..0299c79997d
--- /dev/null
+++ b/addons/account_voucher/account_voucher_workflow.xml
@@ -0,0 +1,75 @@
+
+
+
+
+
+ account.voucher.basic
+ account.voucher
+ True
+
+
+
+
+ True
+ draft
+
+
+
+
+ performa
+ open_voucher()
+ function
+
+
+
+
+ posted
+ proforma_voucher()
+ True
+ function
+
+
+
+
+ cancel
+ cancel_voucher()
+ function
+
+
+
+
+
+ open_voucher
+
+
+
+
+
+ proforma_voucher
+
+
+
+
+
+ cancel_voucher
+
+
+
+
+
+ cancel_voucher
+
+
+
+
+
+ cancel_voucher
+
+
+
+
+
+ open_voucher
+
+
+
\ No newline at end of file
diff --git a/addons/account_voucher/report/__init__.py b/addons/account_voucher/report/__init__.py
new file mode 100755
index 00000000000..c55dad59fef
--- /dev/null
+++ b/addons/account_voucher/report/__init__.py
@@ -0,0 +1,2 @@
+import report_voucher
+import report_voucher_amount
\ No newline at end of file
diff --git a/addons/account_voucher/report/report_voucher.py b/addons/account_voucher/report/report_voucher.py
new file mode 100755
index 00000000000..b3e3c686f58
--- /dev/null
+++ b/addons/account_voucher/report/report_voucher.py
@@ -0,0 +1,72 @@
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+import time
+from report import report_sxw
+from tools import amount_to_text_en
+
+
+class report_voucher(report_sxw.rml_parse):
+ def __init__(self, cr, uid, name, context):
+ super(report_voucher, self).__init__(cr, uid, name, context)
+ self.localcontext.update({
+ 'time': time,
+ 'convert':self.convert,
+ 'debit':self.debit,
+ 'credit':self.credit,
+ 'get_ref' : self._get_ref
+ })
+
+ def convert(self,amount, cur):
+ amt_en = amount_to_text_en.amount_to_text(amount,'en',cur);
+ return amt_en
+
+ def debit(self, move_ids):
+ debit = 0.0
+ for move in move_ids:#self.pool.get('account.move.line').browse(self.cr, self.uid, move_ids):
+ debit +=move.debit
+ return debit
+
+ def credit(self, move_ids):
+ credit = 0.0
+ for move in move_ids:#self.pool.get('account.move.line').browse(self.cr, self.uid, move_ids):
+ credit +=move.credit
+ return credit
+
+ def _get_ref(self, voucher_id, move_ids):
+ voucher_line = self.pool.get('account.voucher.line').search(self.cr, self.uid, [('partner_id','=',move_ids.partner_id.id), ('voucher_id','=',voucher_id)])
+ if voucher_line:
+ voucher = self.pool.get('account.voucher.line').browse(self.cr, self.uid, voucher_line)[0]
+ return voucher.ref
+ else:
+ return
+report_sxw.report_sxw(
+ 'report.voucher.cash_receipt',
+ 'account.voucher',
+ 'addons/account_voucher/report/report_voucher.rml',
+ parser=report_voucher,header=False
+)
\ No newline at end of file
diff --git a/addons/account_voucher/report/report_voucher.rml b/addons/account_voucher/report/report_voucher.rml
new file mode 100755
index 00000000000..685983045ae
--- /dev/null
+++ b/addons/account_voucher/report/report_voucher.rml
@@ -0,0 +1,381 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [[ repeatIn(objects,'voucher') ]]
+ [[ company.name ]]
+ [[ company.partner_id.address and company.partner_id.address[0].street ]]
+ [[ company.partner_id.address and company.partner_id.address[0].zip ]] [[ company.partner_id.address and company.partner_id.address[0].city ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name ]]
+ [[ company.partner_id.address and company.partner_id.address[0].phone ]]
+ [[ company.partner_id.address and company.partner_id.address[0].email ]]
+
+
+
+ Cash Receipt Voucher [[ (voucher.type == 'rec_voucher' or removeParentNode('para')) and '' ]]
+ Cash Payment Voucher [[ (voucher.type == 'pay_voucher' or removeParentNode('para')) and '' ]]
+ Bank Receipt Voucher [[ (voucher.type == 'bank_rec_voucher' or removeParentNode('para')) and '' ]]
+ Bank Payment Voucher [[ (voucher.type == 'bank_pay_voucher' or removeParentNode('para')) and '' ]]
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/account_voucher/report/report_voucher_amount.py b/addons/account_voucher/report/report_voucher_amount.py
new file mode 100755
index 00000000000..3b67ff7a9ac
--- /dev/null
+++ b/addons/account_voucher/report/report_voucher_amount.py
@@ -0,0 +1,51 @@
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+import time
+from report import report_sxw
+from tools import amount_to_text_en
+
+
+class report_voucher_amount(report_sxw.rml_parse):
+ def __init__(self, cr, uid, name, context):
+ super(report_voucher_amount, self).__init__(cr, uid, name, context)
+ self.localcontext.update({
+ 'time': time,
+ 'convert':self.convert
+ })
+
+ def convert(self,amount, cur):
+ amt_en = amount_to_text_en.amount_to_text(amount,'en',cur);
+ return amt_en
+
+
+report_sxw.report_sxw(
+ 'report.voucher.cash_amount',
+ 'account.voucher',
+ 'addons/account_voucher/report/report_voucher_amount.rml',
+ parser=report_voucher_amount,header=False
+)
\ No newline at end of file
diff --git a/addons/account_voucher/report/report_voucher_amount.rml b/addons/account_voucher/report/report_voucher_amount.rml
new file mode 100755
index 00000000000..8adec4c6712
--- /dev/null
+++ b/addons/account_voucher/report/report_voucher_amount.rml
@@ -0,0 +1,353 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [[ repeatIn(objects,'voucher') ]]
+ [[ company.name ]]
+ [[ company.partner_id.address and company.partner_id.address[0].street ]]
+ [[ company.partner_id.address and company.partner_id.address[0].zip ]] [[ company.partner_id.address and company.partner_id.address[0].city ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name ]]
+ [[ company.partner_id.address and company.partner_id.address[0].phone ]]
+ [[ company.partner_id.address and company.partner_id.address[0].email ]]
+
+
+
+ Cash Receipt Voucher [[ (voucher.type == 'rec_voucher' or removeParentNode('para')) and '' ]]
+ Cash Payment Voucher [[ (voucher.type == 'pay_voucher' or removeParentNode('para')) and '' ]]
+ Bank Receipt Voucher [[ (voucher.type == 'bank_rec_voucher' or removeParentNode('para')) and '' ]]
+ Bank Payment Voucher [[ (voucher.type == 'bank_pay_voucher' or removeParentNode('para')) and '' ]]
+
+
+
+
+