commit
0b500fec75
|
@ -76,6 +76,8 @@
|
|||
<wizard string="Create Entries From Models" model="account.model" name="account_use_models" menu="False" id="wizard_account_use_model"/>
|
||||
<menuitem action="wizard_account_use_model" type="wizard" parent="account.menu_finance_recurrent_entries" id="menu_account_use_model"/>
|
||||
|
||||
<wizard string="Create Entries From Models" model="account.move.line" name="account_use_models" menu="True" id="wizard_line_account_use_model"/>
|
||||
|
||||
<!-- account.invoice -->
|
||||
<wizard string="Open State" model="account.invoice" name="account.wizard_paid_open" menu="False" id="wizard_paid_open"/>
|
||||
|
||||
|
|
|
@ -36,6 +36,7 @@ class partner_balance(report_sxw.rml_parse):
|
|||
super(partner_balance, self).__init__(cr, uid, name, context)
|
||||
self.date_lst = []
|
||||
self.date_lst_string = ''
|
||||
self.account_ids = ''
|
||||
self.localcontext.update( {
|
||||
'time': time,
|
||||
'lines': self.lines,
|
||||
|
@ -191,16 +192,15 @@ class partner_balance(report_sxw.rml_parse):
|
|||
else:
|
||||
self.ACCOUNT_TYPE = "('payable','receivable')"
|
||||
#
|
||||
self.cr.execute('SELECT a.id ' \
|
||||
'FROM account_account a ' \
|
||||
'LEFT JOIN account_account_type t ' \
|
||||
'ON (a.type = t.code) ' \
|
||||
'WHERE t.partner_account = TRUE ' \
|
||||
'AND a.company_id = %d ' \
|
||||
'AND a.type IN ' + self.ACCOUNT_TYPE + " " \
|
||||
'AND a.active', (data['form']['company_id'],))
|
||||
self.cr.execute("SELECT a.id " \
|
||||
"FROM account_account a " \
|
||||
"LEFT JOIN account_account_type t " \
|
||||
"ON (a.type = t.code) " \
|
||||
"WHERE a.company_id = %d " \
|
||||
"AND a.type IN " + self.ACCOUNT_TYPE + " " \
|
||||
"AND a.active", (data['form']['company_id'],))
|
||||
self.account_ids = ','.join([str(a) for (a,) in self.cr.fetchall()])
|
||||
|
||||
print"self.account_ids",self.account_ids
|
||||
super(partner_balance, self).preprocess(objects, data, ids)
|
||||
|
||||
def lines(self,data):
|
||||
|
@ -208,16 +208,13 @@ class partner_balance(report_sxw.rml_parse):
|
|||
account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
|
||||
full_account = []
|
||||
result_tmp = 0.0
|
||||
if data['form']['result_selection']=='all':
|
||||
a1=('receivable','payable')
|
||||
elif data['form']['result_selection']=='customer':
|
||||
a1=('receivable','')
|
||||
elif data['form']['result_selection']=='supplier':
|
||||
a1=('payable','')
|
||||
|
||||
#
|
||||
#
|
||||
#
|
||||
if data['form']['soldeinit'] :
|
||||
print"=====self.account_ids======",self.account_ids
|
||||
|
||||
self.cr.execute(
|
||||
"SELECT p.ref, p.name,l.account_id,ac.name as account_name,ac.code as code , sum(debit) as debit, sum(credit) as credit, " \
|
||||
"CASE WHEN sum(debit) > sum(credit) " \
|
||||
|
@ -236,20 +233,19 @@ class partner_balance(report_sxw.rml_parse):
|
|||
") AS enlitige " \
|
||||
"FROM account_move_line l LEFT JOIN res_partner p ON (l.partner_id=p.id) " \
|
||||
"JOIN account_account ac ON (l.account_id = ac.id)" \
|
||||
"WHERE " \
|
||||
"ac.type IN %s " \
|
||||
"WHERE ac.type IN " + self.ACCOUNT_TYPE + " " \
|
||||
"AND l.date < %s AND l.reconcile_id IS NULL " \
|
||||
"GROUP BY p.id, p.ref, p.name,l.account_id,ac.name,ac.code " \
|
||||
"ORDER BY l.account_id,p.name",
|
||||
(self.date_lst[0],a1,self.date_lst[0]))
|
||||
(self.date_lst[0],self.date_lst[0]))
|
||||
res = self.cr.dictfetchall()
|
||||
|
||||
print":::::::::::::::::::::res",res
|
||||
for r in res:
|
||||
full_account.append(r)
|
||||
#
|
||||
#
|
||||
#
|
||||
|
||||
#
|
||||
self.cr.execute(
|
||||
"SELECT p.ref,l.account_id,ac.name as account_name,ac.code as code ,p.name, sum(debit) as debit, sum(credit) as credit, " \
|
||||
"CASE WHEN sum(debit) > sum(credit) " \
|
||||
|
@ -268,13 +264,12 @@ class partner_balance(report_sxw.rml_parse):
|
|||
") AS enlitige " \
|
||||
"FROM account_move_line l LEFT JOIN res_partner p ON (l.partner_id=p.id) " \
|
||||
"JOIN account_account ac ON (l.account_id = ac.id)" \
|
||||
"WHERE " \
|
||||
" ac.type IN %s " \
|
||||
"WHERE ac.type IN " + self.ACCOUNT_TYPE + " " \
|
||||
"AND l.date IN (" + self.date_lst_string + ") " \
|
||||
"GROUP BY p.id, p.ref, p.name,l.account_id,ac.name,ac.code " \
|
||||
"ORDER BY l.account_id,p.name",(a1,))
|
||||
"ORDER BY l.account_id,p.name")
|
||||
res = self.cr.dictfetchall()
|
||||
|
||||
print"==========res",res
|
||||
for r in res:
|
||||
full_account.append(r)
|
||||
|
||||
|
@ -289,10 +284,7 @@ class partner_balance(report_sxw.rml_parse):
|
|||
tot_scredit = 0.0
|
||||
tot_sdebit = 0.0
|
||||
tot_enlitige = 0.0
|
||||
tot_d=0.0
|
||||
print "WWW",cleanarray
|
||||
for r in cleanarray:
|
||||
print "r",r
|
||||
# For the first element we always add the line
|
||||
# type = 1 is the line is the first of the account
|
||||
# type = 2 is an other line of the account
|
||||
|
@ -312,12 +304,10 @@ class partner_balance(report_sxw.rml_parse):
|
|||
new_header['balance'] = float(tot_sdebit) - float(tot_scredit)
|
||||
new_header['type'] = 3
|
||||
##
|
||||
print "33", new_header
|
||||
completearray.append(new_header)
|
||||
#
|
||||
r['type'] = 1
|
||||
r['balance'] = float(r['sdebit']) - float(r['scredit'])
|
||||
print "LEVEL1", r
|
||||
|
||||
completearray.append(r)
|
||||
#
|
||||
|
@ -344,6 +334,8 @@ class partner_balance(report_sxw.rml_parse):
|
|||
# new_tot['type'] = 3
|
||||
# ##
|
||||
# completearray.append(new_tot)
|
||||
|
||||
|
||||
new_header['debit'] = tot_debit
|
||||
new_header['credit'] = tot_credit
|
||||
new_header['scredit'] = tot_scredit
|
||||
|
@ -370,16 +362,20 @@ class partner_balance(report_sxw.rml_parse):
|
|||
new_header['enlitige'] = tot_enlitige
|
||||
new_header['balance'] = float(tot_sdebit) - float(tot_scredit)
|
||||
new_header['type'] = 3
|
||||
print "NEW GEA", new_header
|
||||
##
|
||||
##
|
||||
|
||||
completearray.append(new_header)
|
||||
##
|
||||
#
|
||||
r['type'] = 1
|
||||
#
|
||||
r['balance'] = float(r['sdebit']) - float(r['scredit'])
|
||||
print "RR LEVEEL1",r
|
||||
tot_debit = r['debit']
|
||||
tot_credit = r['credit']
|
||||
tot_scredit = r['scredit']
|
||||
tot_sdebit = r['sdebit']
|
||||
tot_enlitige = (r['enlitige'] or 0.0)
|
||||
#
|
||||
completearray.append(r)
|
||||
|
||||
|
@ -395,67 +391,44 @@ class partner_balance(report_sxw.rml_parse):
|
|||
r['type'] = 2
|
||||
#
|
||||
r['balance'] = float(r['sdebit']) - float(r['scredit'])
|
||||
print "LEVELE2",i,r
|
||||
#
|
||||
|
||||
completearray.append(r)
|
||||
print "fin",i
|
||||
|
||||
i = i + 1
|
||||
|
||||
return completearray
|
||||
|
||||
|
||||
def _sum_debit(self,data):
|
||||
print "daa",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
|
||||
#
|
||||
#
|
||||
if data['form']['result_selection']=='all':
|
||||
a1=('receivable','payable')
|
||||
elif data['form']['result_selection']=='customer':
|
||||
a1=('receivable','')
|
||||
elif data['form']['result_selection']=='supplier':
|
||||
a1=('payable','')
|
||||
|
||||
|
||||
if data['form']['soldeinit'] :
|
||||
self.cr.execute(
|
||||
'SELECT sum(debit) ' \
|
||||
'FROM account_move_line AS l left join account_account ac ON (l.account_id = ac.id)' \
|
||||
'WHERE ' \
|
||||
' ac.type IN %s ' \
|
||||
'AND l.reconcile_id IS NULL ' \
|
||||
'AND date < %s ',
|
||||
(a1,self.date_lst[0],))
|
||||
|
||||
v_res = self.cr.fetchone()
|
||||
if v_res and v_res != None:
|
||||
result_tmp = float(v_res[0] or 0.0)
|
||||
else:
|
||||
result_tmp = 0.0
|
||||
"SELECT sum(debit) " \
|
||||
"FROM account_move_line AS l " \
|
||||
"WHERE l.account_id IN (" + self.account_ids + ") " \
|
||||
"AND l.reconcile_id IS NULL " \
|
||||
"AND date < %s ",
|
||||
(self.date_lst[0],))
|
||||
result_tmp = float(self.cr.fetchone()[0] or 0.0)
|
||||
#
|
||||
#
|
||||
self.cr.execute(
|
||||
'SELECT sum(debit) ' \
|
||||
'FROM account_move_line AS l left join account_account ac ON (l.account_id = ac.id)' \
|
||||
'WHERE ' \
|
||||
# ' account_id IN (' + self.account_ids + ') ' \
|
||||
' ac.type IN %s ' \
|
||||
'AND l.date IN (' + self.date_lst_string + ') ',(a1,) )
|
||||
"SELECT sum(debit) " \
|
||||
"FROM account_move_line AS l " \
|
||||
"WHERE l.account_id IN (" + self.account_ids + ") " \
|
||||
"AND l.date IN (" + self.date_lst_string + ") " )
|
||||
result_tmp = result_tmp + float(self.cr.fetchone()[0] or 0.0)
|
||||
|
||||
return result_tmp
|
||||
|
||||
def _sum_credit(self,data):
|
||||
if data['form']['result_selection']=='all':
|
||||
a1=('receivable','payable')
|
||||
elif data['form']['result_selection']=='customer':
|
||||
a1=('receivable','')
|
||||
elif data['form']['result_selection']=='supplier':
|
||||
a1=('payable','')
|
||||
|
||||
if not self.ids:
|
||||
return 0.0
|
||||
account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
|
||||
|
@ -465,35 +438,26 @@ class partner_balance(report_sxw.rml_parse):
|
|||
#
|
||||
if data['form']['soldeinit'] :
|
||||
self.cr.execute(
|
||||
'SELECT sum(credit) ' \
|
||||
'FROM account_move_line AS l left join account_account ac ON (l.account_id = ac.id)' \
|
||||
'WHERE ' \
|
||||
' ac.type IN %s ' \
|
||||
'AND l.reconcile_id IS NULL ' \
|
||||
'AND date < %s ' ,
|
||||
(a1,self.date_lst[0],))
|
||||
"SELECT sum(credit) " \
|
||||
"FROM account_move_line AS l " \
|
||||
"WHERE l.account_id IN (" + self.account_ids + ") " \
|
||||
"AND l.reconcile_id IS NULL " \
|
||||
"AND l.date < %s " ,
|
||||
(self.date_lst[0],))
|
||||
result_tmp = float(self.cr.fetchone()[0] or 0.0)
|
||||
#
|
||||
#
|
||||
self.cr.execute(
|
||||
'SELECT sum(credit) ' \
|
||||
'FROM account_move_line AS l left join account_account ac ON (l.account_id = ac.id)' \
|
||||
'WHERE ' \
|
||||
# ' account_id IN (' + self.account_ids + ') ' \
|
||||
' ac.type IN %s ' \
|
||||
'AND l.date IN (' + self.date_lst_string + ') ',(a1,) )
|
||||
"SELECT sum(credit) " \
|
||||
"FROM account_move_line AS l " \
|
||||
"WHERE l.account_id IN (" + self.account_ids + ") " \
|
||||
"AND l.date IN (" + self.date_lst_string + ") " )
|
||||
|
||||
result_tmp = result_tmp + float(self.cr.fetchone()[0] or 0.0)
|
||||
|
||||
return result_tmp
|
||||
|
||||
def _sum_litige(self,data):
|
||||
if data['form']['result_selection']=='all':
|
||||
a1=('receivable','payable')
|
||||
elif data['form']['result_selection']=='customer':
|
||||
a1=('receivable','')
|
||||
elif data['form']['result_selection']=='supplier':
|
||||
a1=('payable','')
|
||||
if not self.ids:
|
||||
return 0.0
|
||||
account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
|
||||
|
@ -503,36 +467,27 @@ class partner_balance(report_sxw.rml_parse):
|
|||
#
|
||||
if data['form']['soldeinit'] :
|
||||
self.cr.execute(
|
||||
'SELECT sum(debit-credit) ' \
|
||||
'FROM account_move_line AS l left join account_account ac ON (l.account_id = ac.id)' \
|
||||
'WHERE ' \
|
||||
# ' account_id IN (' + self.account_ids + ') ' \
|
||||
' l.reconcile_id IS NULL ' \
|
||||
'AND ac.type IN %s ' \
|
||||
'AND date < %s ' \
|
||||
'AND blocked=TRUE ' ,
|
||||
(a1,self.date_lst[0],))
|
||||
"SELECT sum(debit-credit) " \
|
||||
"FROM account_move_line AS l " \
|
||||
"WHERE l.account_id IN (" + self.account_ids + ") " \
|
||||
"AND l.reconcile_id IS NULL " \
|
||||
"AND l.date < %s " \
|
||||
"AND l.blocked=TRUE " ,
|
||||
(self.date_lst[0],))
|
||||
result_tmp = float(self.cr.fetchone()[0] or 0.0)
|
||||
#
|
||||
#
|
||||
self.cr.execute(
|
||||
'SELECT sum(debit-credit) ' \
|
||||
'FROM account_move_line AS l left join account_account ac ON (l.account_id = ac.id)' \
|
||||
'WHERE ' \
|
||||
'ac.type IN %s ' \
|
||||
'AND l.date IN (' + self.date_lst_string + ') ' \
|
||||
'AND blocked=TRUE ',(a1,) )
|
||||
"SELECT sum(debit-credit) " \
|
||||
"FROM account_move_line AS l " \
|
||||
"WHERE l.account_id IN (" + self.account_ids + ") " \
|
||||
"AND l.date IN (" + self.date_lst_string + ") " \
|
||||
"AND l.blocked=TRUE " )
|
||||
result_tmp = result_tmp + float(self.cr.fetchone()[0] or 0.0)
|
||||
|
||||
return result_tmp
|
||||
|
||||
def _sum_sdebit(self,data):
|
||||
if data['form']['result_selection']=='all':
|
||||
a1=('receivable','payable')
|
||||
elif data['form']['result_selection']=='customer':
|
||||
a1=('receivable','')
|
||||
elif data['form']['result_selection']=='supplier':
|
||||
a1=('payable','')
|
||||
if not self.ids:
|
||||
return 0.0
|
||||
account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
|
||||
|
@ -542,38 +497,36 @@ class partner_balance(report_sxw.rml_parse):
|
|||
#
|
||||
if data['form']['soldeinit'] :
|
||||
self.cr.execute(
|
||||
'SELECT CASE WHEN sum(debit) > sum(credit) ' \
|
||||
'THEN sum(debit) - sum(credit) ' \
|
||||
'ELSE 0 ' \
|
||||
'END ' \
|
||||
'FROM account_move_line AS l left join account_account ac ON (l.account_id = ac.id)' \
|
||||
'WHERE ' \
|
||||
'ac.type IN %s ' \
|
||||
'AND date < %s ' \
|
||||
'AND reconcile_id IS NULL ' \
|
||||
'GROUP BY partner_id',
|
||||
(a1,self.date_lst[0],))
|
||||
"SELECT CASE WHEN sum(debit) > sum(credit) " \
|
||||
"THEN sum(debit) - sum(credit) " \
|
||||
"ELSE 0 " \
|
||||
"END " \
|
||||
"FROM account_move_line AS l " \
|
||||
"WHERE l.account_id IN (" + self.account_ids + ") " \
|
||||
"AND l.date < %s " \
|
||||
"AND l.reconcile_id IS NULL " \
|
||||
"GROUP BY l.partner_id",
|
||||
(self.date_lst[0],))
|
||||
|
||||
v_res = self.cr.fetchone()
|
||||
if v_res != None :
|
||||
result_tmp = float(v_res[0]) or 0.0
|
||||
if self.cr.fetchone() != None:
|
||||
result_tmp = float(self.cr.fetchone()[0])
|
||||
else:
|
||||
result_tmp = 0.0
|
||||
#
|
||||
#
|
||||
self.cr.execute(
|
||||
'SELECT CASE WHEN sum(debit) > sum(credit) ' \
|
||||
'THEN sum(debit) - sum(credit) ' \
|
||||
'ELSE 0 ' \
|
||||
'END ' \
|
||||
'FROM account_move_line AS l left join account_account ac ON (l.account_id = ac.id)' \
|
||||
'WHERE ' \
|
||||
' ac.type IN %s ' \
|
||||
'AND l.date IN (' + self.date_lst_string + ') ' \
|
||||
'GROUP BY partner_id',(a1,))
|
||||
v_res = self.cr.fetchone()
|
||||
if v_res != None:
|
||||
result_tmp = result_tmp + ( v_res[0] or 0.0)
|
||||
"SELECT CASE WHEN sum(debit) > sum(credit) " \
|
||||
"THEN sum(debit) - sum(credit) " \
|
||||
"ELSE 0 " \
|
||||
"END " \
|
||||
"FROM account_move_line AS l " \
|
||||
"WHERE l.account_id IN (" + self.account_ids + ") " \
|
||||
"AND l.date IN (" + self.date_lst_string + ") " \
|
||||
"GROUP BY l.partner_id")
|
||||
a = self.cr.fetchone()[0]
|
||||
|
||||
if self.cr.fetchone() != None:
|
||||
result_tmp = result_tmp + (a or 0.0)
|
||||
else:
|
||||
result_tmp = 0.0
|
||||
|
||||
|
@ -581,12 +534,6 @@ class partner_balance(report_sxw.rml_parse):
|
|||
|
||||
def _sum_scredit(self,data):
|
||||
|
||||
if data['form']['result_selection']=='all':
|
||||
a1=('receivable','payable')
|
||||
elif data['form']['result_selection']=='customer':
|
||||
a1=('receivable','')
|
||||
elif data['form']['result_selection']=='supplier':
|
||||
a1=('payable','')
|
||||
if not self.ids:
|
||||
return 0.0
|
||||
account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
|
||||
|
@ -596,38 +543,35 @@ class partner_balance(report_sxw.rml_parse):
|
|||
#
|
||||
if data['form']['soldeinit'] :
|
||||
self.cr.execute(
|
||||
'SELECT CASE WHEN sum(debit) < sum(credit) ' \
|
||||
'THEN sum(credit) - sum(debit) ' \
|
||||
'ELSE 0 ' \
|
||||
'END ' \
|
||||
'FROM account_move_line AS l left join account_account ac ON (l.account_id = ac.id)' \
|
||||
'WHERE ' \
|
||||
' ac.type IN %s ' \
|
||||
'AND date <= %s ' \
|
||||
'AND l.reconcile_id IS NULL ' \
|
||||
'GROUP BY partner_id',
|
||||
(a1,self.date_lst[0],))
|
||||
"SELECT CASE WHEN sum(debit) < sum(credit) " \
|
||||
"THEN sum(credit) - sum(debit) " \
|
||||
"ELSE 0 " \
|
||||
"END " \
|
||||
"FROM account_move_line AS l " \
|
||||
"WHERE l.account_id IN (" + self.account_ids + ") " \
|
||||
"AND l.date <= %s " \
|
||||
"AND l.reconcile_id IS NULL " \
|
||||
"GROUP BY l.partner_id",
|
||||
(self.date_lst[0],))
|
||||
|
||||
v_res = self.cr.fetchone()
|
||||
if v_res != None:
|
||||
result_tmp = float(v_res[0]) or 0.0
|
||||
if self.cr.fetchone() != None:
|
||||
result_tmp = float(self.cr.fetchone()[0]) or 0.0
|
||||
else:
|
||||
result_tmp = 0.0
|
||||
#
|
||||
#
|
||||
self.cr.execute(
|
||||
'SELECT CASE WHEN sum(debit) < sum(credit) ' \
|
||||
'THEN sum(credit) - sum(debit) ' \
|
||||
'ELSE 0 ' \
|
||||
'END ' \
|
||||
'FROM account_move_line AS l left join account_account ac ON (l.account_id = ac.id)' \
|
||||
'WHERE ' \
|
||||
' ac.type IN %s ' \
|
||||
' AND l.date IN (' + self.date_lst_string + ') ' \
|
||||
'GROUP BY partner_id',(a1,))
|
||||
a = self.cr.fetchone()
|
||||
if a != None :
|
||||
result_tmp = result_tmp + (a[0] or 0.0)
|
||||
"SELECT CASE WHEN sum(debit) < sum(credit) " \
|
||||
"THEN sum(credit) - sum(debit) " \
|
||||
"ELSE 0 " \
|
||||
"END " \
|
||||
"FROM account_move_line AS l " \
|
||||
"WHERE l.account_id IN (" + self.account_ids + ") " \
|
||||
"AND l.date IN (" + self.date_lst_string + ") " \
|
||||
"GROUP BY l.partner_id")
|
||||
a = self.cr.fetchone()[0] or 0.0
|
||||
if self.cr.fetchone() != None:
|
||||
result_tmp = result_tmp + (a or 0.0)
|
||||
|
||||
else:
|
||||
result_tmp = 0.0
|
||||
|
|
|
@ -169,22 +169,22 @@ class third_party_ledger(rml_parse.rml_parse):
|
|||
#
|
||||
#new_ids = [id for (id,) in self.cr.fetchall()]
|
||||
if data['form']['result_selection'] == 'supplier':
|
||||
ACCOUNT_TYPE = "AND a.type='payable' "
|
||||
self.ACCOUNT_TYPE = "('receivable')"
|
||||
elif data['form']['result_selection'] == 'customer':
|
||||
ACCOUNT_TYPE = "AND a.type='receivable' "
|
||||
self.ACCOUNT_TYPE = "('payable')"
|
||||
elif data['form']['result_selection'] == 'all':
|
||||
ACCOUNT_TYPE = "AND (a.type='receivable' OR a.type='payable') "
|
||||
self.ACCOUNT_TYPE = "('payable','receivable')"
|
||||
|
||||
self.cr.execute(
|
||||
"SELECT a.id " \
|
||||
"FROM account_account a " \
|
||||
"LEFT JOIN account_account_type t " \
|
||||
"ON (a.type=t.code) " \
|
||||
"WHERE t.partner_account=TRUE " \
|
||||
"AND a.company_id = %d " \
|
||||
" " + ACCOUNT_TYPE + " " \
|
||||
"WHERE a.company_id = %d " \
|
||||
'AND a.type IN ' + self.ACCOUNT_TYPE + " " \
|
||||
"AND a.active", (data['form']['company_id'],))
|
||||
self.account_ids = ','.join([str(a) for (a,) in self.cr.fetchall()])
|
||||
print"self.account_ids",self.account_ids
|
||||
account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
|
||||
partner_to_use = []
|
||||
|
||||
|
@ -196,7 +196,7 @@ class third_party_ledger(rml_parse.rml_parse):
|
|||
"AND line.account_id = account.id " \
|
||||
"AND line.date <= %s " \
|
||||
"AND line.reconcile_id IS NULL " \
|
||||
# "AND line.account_id IN (" + self.account_ids + ") " \
|
||||
"AND line.account_id IN (" + self.account_ids + ") " \
|
||||
" " + PARTNER_REQUEST + " " \
|
||||
"AND account.company_id = %d " \
|
||||
"AND account.active " ,
|
||||
|
@ -208,16 +208,14 @@ class third_party_ledger(rml_parse.rml_parse):
|
|||
"WHERE line.partner_id IS NOT NULL " \
|
||||
"AND line.account_id = account.id " \
|
||||
"AND line.date IN (" + self.date_lst_string + ") " \
|
||||
# "AND line.account_id IN (" + self.account_ids + ") " \
|
||||
"AND line.account_id IN (" + self.account_ids + ") " \
|
||||
" " + PARTNER_REQUEST + " " \
|
||||
"AND account.company_id = %d " \
|
||||
"AND account.active " ,
|
||||
(data['form']['company_id']))
|
||||
|
||||
res = self.cr.dictfetchall()
|
||||
for res_line in res:
|
||||
partner_to_use.append(res_line['partner_id'])
|
||||
res = self.cr.dictfetchall()
|
||||
|
||||
print"res",res
|
||||
for res_line in res:
|
||||
partner_to_use.append(res_line['partner_id'])
|
||||
new_ids = partner_to_use
|
||||
|
@ -239,7 +237,7 @@ class third_party_ledger(rml_parse.rml_parse):
|
|||
"LEFT JOIN account_journal j " \
|
||||
"ON (l.journal_id = j.id) " \
|
||||
"WHERE l.partner_id = %d " \
|
||||
# "AND l.account_id IN (" + self.account_ids + ") " \
|
||||
"AND l.account_id IN (" + self.account_ids + ") " \
|
||||
"AND l.date < %s " \
|
||||
"AND l.reconcile_id IS NULL "
|
||||
"ORDER BY l.id",
|
||||
|
@ -257,7 +255,7 @@ class third_party_ledger(rml_parse.rml_parse):
|
|||
"LEFT JOIN account_journal j " \
|
||||
"ON (l.journal_id = j.id) " \
|
||||
"WHERE l.partner_id = %d " \
|
||||
# "AND l.account_id IN (" + self.account_ids + ") " \
|
||||
"AND l.account_id IN (" + self.account_ids + ") " \
|
||||
"AND l.date IN (" + self.date_lst_string + ") " \
|
||||
" " + RECONCILE_TAG + " "\
|
||||
"ORDER BY l.id",
|
||||
|
@ -284,7 +282,7 @@ class third_party_ledger(rml_parse.rml_parse):
|
|||
"SELECT sum(debit) " \
|
||||
"FROM account_move_line " \
|
||||
"WHERE partner_id = %d " \
|
||||
# "AND account_id IN (" + self.account_ids + ") " \
|
||||
"AND account_id IN (" + self.account_ids + ") " \
|
||||
"AND reconcile_id IS NULL " \
|
||||
"AND date < %s " ,
|
||||
(partner.id, self.date_lst[0],))
|
||||
|
@ -299,7 +297,7 @@ class third_party_ledger(rml_parse.rml_parse):
|
|||
"SELECT sum(debit) " \
|
||||
"FROM account_move_line " \
|
||||
"WHERE partner_id = %d " \
|
||||
# "AND account_id IN (" + self.account_ids + ") " \
|
||||
"AND account_id IN (" + self.account_ids + ") " \
|
||||
" " + RECONCILE_TAG + " " \
|
||||
"AND date IN (" + self.date_lst_string + ") " ,
|
||||
(partner.id,))
|
||||
|
@ -323,7 +321,7 @@ class third_party_ledger(rml_parse.rml_parse):
|
|||
"SELECT sum(credit) " \
|
||||
"FROM account_move_line " \
|
||||
"WHERE partner_id=%d " \
|
||||
# "AND account_id IN (" + self.account_ids + ") " \
|
||||
"AND account_id IN (" + self.account_ids + ") " \
|
||||
"AND reconcile_id IS NULL " \
|
||||
"AND date < %s " ,
|
||||
(partner.id,self.date_lst[0],))
|
||||
|
@ -337,7 +335,7 @@ class third_party_ledger(rml_parse.rml_parse):
|
|||
"SELECT sum(credit) " \
|
||||
"FROM account_move_line " \
|
||||
"WHERE partner_id=%d " \
|
||||
# "AND account_id IN (" + self.account_ids + ") " \
|
||||
"AND account_id IN (" + self.account_ids + ") " \
|
||||
" " + RECONCILE_TAG + " " \
|
||||
"AND date IN (" + self.date_lst_string + ") " ,
|
||||
(partner.id,))
|
||||
|
@ -363,7 +361,7 @@ class third_party_ledger(rml_parse.rml_parse):
|
|||
"SELECT sum(debit) " \
|
||||
"FROM account_move_line " \
|
||||
"WHERE partner_id IN (" + self.partner_ids + ") " \
|
||||
# "AND account_id IN (" + self.account_ids + ") " \
|
||||
"AND account_id IN (" + self.account_ids + ") " \
|
||||
"AND reconcile_id IS NULL " \
|
||||
"AND date < %s " ,
|
||||
(self.date_lst[0],))
|
||||
|
@ -377,7 +375,7 @@ class third_party_ledger(rml_parse.rml_parse):
|
|||
"SELECT sum(debit) " \
|
||||
"FROM account_move_line " \
|
||||
"WHERE partner_id IN (" + self.partner_ids + ") " \
|
||||
# "AND account_id IN (" + self.account_ids + ") " \
|
||||
"AND account_id IN (" + self.account_ids + ") " \
|
||||
" " + RECONCILE_TAG + " " \
|
||||
"AND date IN (" + self.date_lst_string + ") "
|
||||
)
|
||||
|
@ -405,7 +403,7 @@ class third_party_ledger(rml_parse.rml_parse):
|
|||
"SELECT sum(credit) " \
|
||||
"FROM account_move_line " \
|
||||
"WHERE partner_id IN (" + self.partner_ids + ") " \
|
||||
# "AND account_id IN (" + self.account_ids + ") " \
|
||||
"AND account_id IN (" + self.account_ids + ") " \
|
||||
"AND reconcile_id IS NULL " \
|
||||
"AND date < %s " ,
|
||||
(self.date_lst[0],))
|
||||
|
@ -418,7 +416,7 @@ class third_party_ledger(rml_parse.rml_parse):
|
|||
"SELECT sum(credit) " \
|
||||
"FROM account_move_line " \
|
||||
"WHERE partner_id IN (" + self.partner_ids + ") " \
|
||||
# "AND account_id IN (" + self.account_ids + ") " \
|
||||
"AND account_id IN (" + self.account_ids + ") " \
|
||||
" " + RECONCILE_TAG + " " \
|
||||
"AND date IN (" + self.date_lst_string + ") "
|
||||
)
|
||||
|
|
|
@ -22,7 +22,7 @@ fields = {
|
|||
}
|
||||
def _create_entries(self, cr, uid, data, context):
|
||||
pool_obj = pooler.get_pool(cr.dbname)
|
||||
if data['model']=='ir.ui.menu':
|
||||
if data['model']=='ir.ui.menu' or data['model']=='account.move.line':
|
||||
model_ids = data['form']['model'][0][2]
|
||||
data_model = pool_obj.get('account.model').browse(cr,uid,model_ids)
|
||||
else:
|
||||
|
@ -95,7 +95,7 @@ class use_model(wizard.interface):
|
|||
}
|
||||
|
||||
def _check(self, cr, uid, data, context):
|
||||
if data['model']=='ir.ui.menu':
|
||||
if data['model']=='ir.ui.menu' or data['model']=='account.move.line':
|
||||
return 'init_form'
|
||||
return 'create'
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
<field name="res_model">crm.case</field>
|
||||
<field name="view_mode">tree,calendar,form</field>
|
||||
<field name="view_id" ref="crm.crm_case_tree-view"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+')]'"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+')]'"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111">
|
||||
<field name="sequence" eval="1"/>
|
||||
|
@ -36,7 +36,7 @@
|
|||
<field name="res_model">crm.case</field>
|
||||
<field name="view_mode">tree,calendar,form</field>
|
||||
<field name="view_id" ref="crm.crm_case_tree-view"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'user_id\',\'=\',uid)]'"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'user_id\',\'=\',uid)]'"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view1">
|
||||
<field name="sequence" eval="1"/>
|
||||
|
@ -64,7 +64,7 @@
|
|||
<field name="res_model">crm.case</field>
|
||||
<field name="view_mode">form,tree</field>
|
||||
<field name="view_id" ref="crm.crm_case-view"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+')]'"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+')]'"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view1">
|
||||
<field name="sequence" eval="2"/>
|
||||
|
@ -86,7 +86,7 @@
|
|||
<field name="res_model">crm.case</field>
|
||||
<field name="view_mode">tree,calendar,form</field>
|
||||
<field name="view_id" ref="crm.crm_case_tree-view"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'<>\',\'done\')]'"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'<>\',\'done\')]'"/>
|
||||
</record>
|
||||
|
||||
<record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view_my1">
|
||||
|
@ -117,7 +117,7 @@
|
|||
<field name="res_model">crm.case</field>
|
||||
<field name="view_mode">tree,calendar,form</field>
|
||||
<field name="view_id" ref="crm.crm_case_tree-view"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my2">
|
||||
<field name="sequence" eval="1"/>
|
||||
|
@ -144,7 +144,7 @@
|
|||
<field name="res_model">crm.case</field>
|
||||
<field name="view_mode">tree,calendar,form</field>
|
||||
<field name="view_id" ref="crm.crm_case_tree-view"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\')]'"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\')]'"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my1">
|
||||
<field name="sequence" eval="1"/>
|
||||
|
@ -171,7 +171,7 @@
|
|||
<field name="res_model">crm.case</field>
|
||||
<field name="view_mode">tree,calendar,form</field>
|
||||
<field name="view_id" ref="crm.crm_case_tree-view"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my0">
|
||||
<field name="sequence" eval="1"/>
|
||||
|
@ -199,7 +199,7 @@
|
|||
<field name="res_model">crm.case</field>
|
||||
<field name="view_mode">calendar,tree,form</field>
|
||||
<field name="view_id" ref="crm.crm_case_calendar-view"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'state\',\'=\',\'done\'),(\'user_id\',\'=\',uid)]'"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'=\',\'done\'),(\'user_id\',\'=\',uid)]'"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_myhelpdesk">
|
||||
<field name="sequence" eval="1"/>
|
||||
|
@ -233,7 +233,7 @@
|
|||
<field name="res_model">crm.case</field>
|
||||
<field name="view_mode">tree,calendar,form</field>
|
||||
<field name="view_id" ref="crm.crm_case_tree-view"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'state\',\'<>\',\'done\')]'"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'<>\',\'done\')]'"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all3">
|
||||
<field name="sequence" eval="1"/>
|
||||
|
@ -260,7 +260,7 @@
|
|||
<field name="res_model">crm.case</field>
|
||||
<field name="view_mode">tree,calendar,form</field>
|
||||
<field name="view_id" ref="crm.crm_case_tree-view"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'state\',\'=\',\'draft\')]'"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'=\',\'draft\')]'"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all2">
|
||||
<field name="sequence" eval="1"/>
|
||||
|
@ -287,7 +287,7 @@
|
|||
<field name="res_model">crm.case</field>
|
||||
<field name="view_mode">tree,calendar,form</field>
|
||||
<field name="view_id" ref="crm.crm_case_tree-view"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'state\',\'=\',\'pending\')]'"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'=\',\'pending\')]'"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all1">
|
||||
<field name="sequence" eval="1"/>
|
||||
|
@ -315,7 +315,7 @@
|
|||
<field name="res_model">crm.case</field>
|
||||
<field name="view_mode">tree,calendar,form</field>
|
||||
<field name="view_id" ref="crm.crm_case_tree-view"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'state\',\'=\',\'open\')]'"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'=\',\'open\')]'"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all0">
|
||||
<field name="sequence" eval="1"/>
|
||||
|
@ -342,7 +342,7 @@
|
|||
<field name="res_model">crm.case</field>
|
||||
<field name="view_mode">calendar,tree,form</field>
|
||||
<field name="view_id" ref="crm.crm_case_calendar-view"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'state\',\'=\',\'done\')]'"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'=\',\'done\')]'"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_allhelpdesk">
|
||||
<field name="sequence" eval="1"/>
|
||||
|
|
|
@ -44,8 +44,8 @@
|
|||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Job Info">
|
||||
<field name="partner_name"/>
|
||||
<field name="partner_name2"/>
|
||||
<field name="partner_name" string="Candidate Name"/>
|
||||
<field name="partner_name2" string="Candidate Name2"/>
|
||||
<newline/>
|
||||
<field name="partner_phone"/>
|
||||
<field name="partner_mobile"/>
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
<record model="ir.actions.act_window" id="crm_case_category_act_leads_all">
|
||||
<field name="name">All Leads</field>
|
||||
<field name="res_model">crm.case</field>
|
||||
<field name="view_mode">tree,calendar,form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="crm_case_tree_view_leads"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
|
||||
</record>
|
||||
|
@ -18,12 +18,6 @@
|
|||
<field name="view_id" ref="crm_case_tree_view_leads"/>
|
||||
<field name="act_window_id" ref="crm_case_category_act_leads_all"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all">
|
||||
<field name="sequence" eval="2"/>
|
||||
<field name="view_mode">calendar</field>
|
||||
<field name="view_id" ref="crm_case_calendar_view_leads"/>
|
||||
<field name="act_window_id" ref="crm_case_category_act_leads_all"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all">
|
||||
<field name="sequence" eval="3"/>
|
||||
<field name="view_mode">form</field>
|
||||
|
@ -36,7 +30,7 @@
|
|||
<record model="ir.actions.act_window" id="crm_case_category_act_leads_all1">
|
||||
<field name="name">Current Leads</field>
|
||||
<field name="res_model">crm.case</field>
|
||||
<field name="view_mode">tree,calendar,form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="crm_case_tree_view_leads"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'<>\',\'done\'),(\'state\',\'<>\',\'cancel\')]'"/>
|
||||
</record>
|
||||
|
@ -46,12 +40,6 @@
|
|||
<field name="view_id" ref="crm_case_tree_view_leads"/>
|
||||
<field name="act_window_id" ref="crm_case_category_act_leads_all1"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all1">
|
||||
<field name="sequence" eval="2"/>
|
||||
<field name="view_mode">calendar</field>
|
||||
<field name="view_id" ref="crm_case_calendar_view_leads"/>
|
||||
<field name="act_window_id" ref="crm_case_category_act_leads_all1"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all1">
|
||||
<field name="sequence" eval="3"/>
|
||||
<field name="view_mode">form</field>
|
||||
|
@ -63,7 +51,7 @@
|
|||
<record model="ir.actions.act_window" id="crm_case_category_act_leads_unassigned">
|
||||
<field name="name">Unassigned Leads</field>
|
||||
<field name="res_model">crm.case</field>
|
||||
<field name="view_mode">tree,calendar,form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="crm_case_tree_view_leads"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'<>\',\'done\'),(\'state\',\'<>\',\'cancel\'),(\'user_id\',\'=\',False)]'"/>
|
||||
</record>
|
||||
|
@ -73,12 +61,6 @@
|
|||
<field name="view_id" ref="crm_case_tree_view_leads"/>
|
||||
<field name="act_window_id" ref="crm_case_category_act_leads_unassigned"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_unassigned">
|
||||
<field name="sequence" eval="2"/>
|
||||
<field name="view_mode">calendar</field>
|
||||
<field name="view_id" ref="crm_case_calendar_view_leads"/>
|
||||
<field name="act_window_id" ref="crm_case_category_act_leads_unassigned"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_unassigned">
|
||||
<field name="sequence" eval="3"/>
|
||||
<field name="view_mode">form</field>
|
||||
|
@ -93,7 +75,7 @@
|
|||
<record model="ir.actions.act_window" id="crm_case_category_act_leads_all2">
|
||||
<field name="name">All Draft Leads</field>
|
||||
<field name="res_model">crm.case</field>
|
||||
<field name="view_mode">tree,calendar,form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="crm_case_tree_view_leads"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'draft\')]'"/>
|
||||
</record>
|
||||
|
@ -103,12 +85,6 @@
|
|||
<field name="view_id" ref="crm_case_tree_view_leads"/>
|
||||
<field name="act_window_id" ref="crm_case_category_act_leads_all2"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all2">
|
||||
<field name="sequence" eval="2"/>
|
||||
<field name="view_mode">calendar</field>
|
||||
<field name="view_id" ref="crm_case_calendar_view_leads"/>
|
||||
<field name="act_window_id" ref="crm_case_category_act_leads_all2"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all2">
|
||||
<field name="sequence" eval="3"/>
|
||||
<field name="view_mode">form</field>
|
||||
|
@ -120,7 +96,7 @@
|
|||
<record model="ir.actions.act_window" id="crm_case_category_act_leads_all3">
|
||||
<field name="name">All Open Leads</field>
|
||||
<field name="res_model">crm.case</field>
|
||||
<field name="view_mode">tree,calendar,form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="crm_case_tree_view_leads"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'open\')]'"/>
|
||||
</record>
|
||||
|
@ -130,12 +106,6 @@
|
|||
<field name="view_id" ref="crm_case_tree_view_leads"/>
|
||||
<field name="act_window_id" ref="crm_case_category_act_leads_all3"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all3">
|
||||
<field name="sequence" eval="2"/>
|
||||
<field name="view_mode">calendar</field>
|
||||
<field name="view_id" ref="crm_case_calendar_view_leads"/>
|
||||
<field name="act_window_id" ref="crm_case_category_act_leads_all3"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all3">
|
||||
<field name="sequence" eval="3"/>
|
||||
<field name="view_mode">form</field>
|
||||
|
@ -147,7 +117,7 @@
|
|||
<record model="ir.actions.act_window" id="crm_case_category_act_leads_all4">
|
||||
<field name="name">All Pending Leads</field>
|
||||
<field name="res_model">crm.case</field>
|
||||
<field name="view_mode">tree,calendar,form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="crm_case_tree_view_leads"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'pending\')]'"/>
|
||||
</record>
|
||||
|
@ -157,12 +127,6 @@
|
|||
<field name="view_id" ref="crm_case_tree_view_leads"/>
|
||||
<field name="act_window_id" ref="crm_case_category_act_leads_all4"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all4">
|
||||
<field name="sequence" eval="2"/>
|
||||
<field name="view_mode">calendar</field>
|
||||
<field name="view_id" ref="crm_case_calendar_view_leads"/>
|
||||
<field name="act_window_id" ref="crm_case_category_act_leads_all4"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all4">
|
||||
<field name="sequence" eval="3"/>
|
||||
<field name="view_mode">form</field>
|
||||
|
@ -175,7 +139,7 @@
|
|||
<record model="ir.actions.act_window" id="crm_case_category_act_leads_my">
|
||||
<field name="name">My Leads</field>
|
||||
<field name="res_model">crm.case</field>
|
||||
<field name="view_mode">tree,calendar,form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="crm_case_tree_view_leads"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid)]'"/>
|
||||
</record>
|
||||
|
@ -185,12 +149,6 @@
|
|||
<field name="view_id" ref="crm_case_tree_view_leads"/>
|
||||
<field name="act_window_id" ref="crm_case_category_act_leads_my"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my">
|
||||
<field name="sequence" eval="2"/>
|
||||
<field name="view_mode">calendar</field>
|
||||
<field name="view_id" ref="crm_case_calendar_view_leads"/>
|
||||
<field name="act_window_id" ref="crm_case_category_act_leads_my"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my">
|
||||
<field name="sequence" eval="3"/>
|
||||
<field name="view_mode">form</field>
|
||||
|
@ -203,7 +161,7 @@
|
|||
<field name="name">New Lead</field>
|
||||
<field name="res_model">crm.case</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">form,tree,calendar</field>
|
||||
<field name="view_mode">form,tree</field>
|
||||
<field name="view_id" ref="crm_case_form_view_leads"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
|
||||
</record>
|
||||
|
@ -224,7 +182,7 @@
|
|||
<record model="ir.actions.act_window" id="crm_case_category_act_leads_my1">
|
||||
<field name="name">My Current Leads</field>
|
||||
<field name="res_model">crm.case</field>
|
||||
<field name="view_mode">tree,calendar,form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="crm_case_tree_view_leads"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'<>\',\'done\'),(\'state\',\'<>\',\'cancel\')]'"/>
|
||||
</record>
|
||||
|
@ -234,12 +192,6 @@
|
|||
<field name="view_id" ref="crm_case_tree_view_leads"/>
|
||||
<field name="act_window_id" ref="crm_case_category_act_leads_my1"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my1">
|
||||
<field name="sequence" eval="2"/>
|
||||
<field name="view_mode">calendar</field>
|
||||
<field name="view_id" ref="crm_case_calendar_view_leads"/>
|
||||
<field name="act_window_id" ref="crm_case_category_act_leads_my1"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my1">
|
||||
<field name="sequence" eval="3"/>
|
||||
<field name="view_mode">form</field>
|
||||
|
@ -251,7 +203,7 @@
|
|||
<record model="ir.actions.act_window" id="crm_case_category_act_leads_my3">
|
||||
<field name="name">My Open Leads</field>
|
||||
<field name="res_model">crm.case</field>
|
||||
<field name="view_mode">tree,calendar,form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="crm_case_tree_view_leads"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
|
||||
</record>
|
||||
|
@ -261,12 +213,6 @@
|
|||
<field name="view_id" ref="crm_case_tree_view_leads"/>
|
||||
<field name="act_window_id" ref="crm_case_category_act_leads_my3"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my3">
|
||||
<field name="sequence" eval="2"/>
|
||||
<field name="view_mode">calendar</field>
|
||||
<field name="view_id" ref="crm_case_calendar_view_leads"/>
|
||||
<field name="act_window_id" ref="crm_case_category_act_leads_my3"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my3">
|
||||
<field name="sequence" eval="3"/>
|
||||
<field name="view_mode">form</field>
|
||||
|
@ -278,7 +224,7 @@
|
|||
<record model="ir.actions.act_window" id="crm_case_category_act_leads_my4">
|
||||
<field name="name">My Pending Leads</field>
|
||||
<field name="res_model">crm.case</field>
|
||||
<field name="view_mode">tree,calendar,form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="crm_case_tree_view_leads"/>
|
||||
<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\')]'"/>
|
||||
</record>
|
||||
|
@ -288,12 +234,6 @@
|
|||
<field name="view_id" ref="crm_case_tree_view_leads"/>
|
||||
<field name="act_window_id" ref="crm_case_category_act_leads_my4"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my4">
|
||||
<field name="sequence" eval="2"/>
|
||||
<field name="view_mode">calendar</field>
|
||||
<field name="view_id" ref="crm_case_calendar_view_leads"/>
|
||||
<field name="act_window_id" ref="crm_case_category_act_leads_my4"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my4">
|
||||
<field name="sequence" eval="3"/>
|
||||
<field name="view_mode">form</field>
|
||||
|
|
|
@ -89,6 +89,7 @@ class make_opportunity(wizard.interface):
|
|||
})
|
||||
value = {
|
||||
'domain': "[]",
|
||||
'name': _('Opportunity'),
|
||||
'view_type': 'form',
|
||||
'view_mode': 'form,tree',
|
||||
'res_model': 'crm.case',
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -25,7 +25,7 @@
|
|||
<field name="close_method">balance</field>
|
||||
</record>
|
||||
|
||||
<record id="account_type_stocks" model="account.account.type">
|
||||
<record id="account_type_stock" model="account.account.type">
|
||||
<field name="name">Stocks</field>
|
||||
<field name="code">stocks</field>
|
||||
<field name="close_method">balance</field>
|
||||
|
@ -70,7 +70,7 @@
|
|||
<record model="account.account.type" id="account_type_tax">
|
||||
<field name="name">Tax</field>
|
||||
<field name="code">tax</field>
|
||||
<field name="close_method">balance</field>
|
||||
<field name="close_method">unreconciled</field>
|
||||
</record>
|
||||
|
||||
<record model="account.account.type" id="account_type_cash">
|
||||
|
@ -103,7 +103,7 @@
|
|||
<field name="close_method">balance</field>
|
||||
</record>
|
||||
|
||||
<record model="account.account.type" id="account_type_stock">
|
||||
<record model="account.account.type" id="account_type_stocks">
|
||||
<field name="name">Actif circulant</field>
|
||||
<field name="code">current asset</field>
|
||||
<field name="close_method">balance</field>
|
||||
|
|
|
@ -169,7 +169,7 @@ msgstr ""
|
|||
#. module: mrp
|
||||
#: view:mrp.routing.workcenter:0
|
||||
msgid "Routing Workcenters"
|
||||
msgstr "Centre de Travail d'Acheminement"
|
||||
msgstr "Gammes"
|
||||
|
||||
#. module: mrp
|
||||
#: field:mrp.procurement,date_close:0
|
||||
|
@ -231,13 +231,13 @@ msgstr ""
|
|||
#. module: mrp
|
||||
#: model:ir.model,name:mrp.model_mrp_routing_workcenter
|
||||
msgid "Routing workcenter usage"
|
||||
msgstr "Usage des Centre de Travail d'Acheminement"
|
||||
msgstr "Usage des gammes"
|
||||
|
||||
#. module: mrp
|
||||
#: model:ir.actions.act_window,name:mrp.mrp_routing_action
|
||||
#: model:ir.ui.menu,name:mrp.menu_mrp_routing_action
|
||||
msgid "Routings"
|
||||
msgstr "Acheminements"
|
||||
msgstr "Gammes"
|
||||
|
||||
#. module: mrp
|
||||
#: model:ir.actions.act_window,name:mrp.mrp_property_group_action
|
||||
|
@ -382,7 +382,7 @@ msgstr ""
|
|||
#. module: mrp
|
||||
#: view:mrp.routing:0
|
||||
msgid "Workcenter Operations"
|
||||
msgstr "Opérations du Centre de Travail"
|
||||
msgstr "Opérations par postes"
|
||||
|
||||
#. module: mrp
|
||||
#: model:process.transition,note:mrp.process_transition_procurementservice0
|
||||
|
@ -462,7 +462,7 @@ msgstr ""
|
|||
#. module: mrp
|
||||
#: model:ir.model,name:mrp.model_mrp_production_workcenter_line
|
||||
msgid "Production workcenters used"
|
||||
msgstr "Centre de Travail de Production Utilisés"
|
||||
msgstr "Production par poste de charge"
|
||||
|
||||
#. module: mrp
|
||||
#: field:mrp.procurement,priority:0
|
||||
|
@ -478,7 +478,7 @@ msgstr "En attente"
|
|||
#. module: mrp
|
||||
#: field:mrp.production,workcenter_lines:0
|
||||
msgid "Workcenters Utilisation"
|
||||
msgstr "Utilisation du Centre de Travail"
|
||||
msgstr "Utilisation des postes de charge"
|
||||
|
||||
#. module: mrp
|
||||
#: help:mrp.bom,product_efficiency:0
|
||||
|
@ -490,7 +490,7 @@ msgstr ""
|
|||
#: field:mrp.bom,routing_id:0
|
||||
#: view:mrp.routing:0
|
||||
msgid "Routing"
|
||||
msgstr "Acheminement"
|
||||
msgstr "Gamme"
|
||||
|
||||
#. module: mrp
|
||||
#: model:process.node,name:mrp.process_node_subcontracting0
|
||||
|
@ -573,7 +573,7 @@ msgstr ""
|
|||
#. module: mrp
|
||||
#: model:ir.ui.menu,name:mrp.menu_mrp_reordering
|
||||
msgid "Automatic Procurements"
|
||||
msgstr ""
|
||||
msgstr "Approvisionements automatisés"
|
||||
|
||||
#. module: mrp
|
||||
#: field:mrp.bom,product_qty:0
|
||||
|
@ -691,7 +691,7 @@ msgstr "Approvisionnement"
|
|||
#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action
|
||||
#: model:process.node,note:mrp.process_node_procurements0
|
||||
msgid "Procurement Orders"
|
||||
msgstr "Ordre d'Approvisionnement"
|
||||
msgstr "Ordres d'approvisionnement"
|
||||
|
||||
#. module: mrp
|
||||
#: model:process.node,note:mrp.process_node_stockableproduction0
|
||||
|
@ -721,7 +721,7 @@ msgstr "Propriété"
|
|||
#. module: mrp
|
||||
#: field:mrp.routing.workcenter,routing_id:0
|
||||
msgid "Parent Routing"
|
||||
msgstr "Acheminement Parent"
|
||||
msgstr "Gamme Parent"
|
||||
|
||||
#. module: mrp
|
||||
#: model:process.node,note:mrp.process_node_billofmaterial0
|
||||
|
@ -971,7 +971,7 @@ msgstr ""
|
|||
#: model:ir.actions.act_window,name:mrp.mrp_production_action2
|
||||
#: model:ir.ui.menu,name:mrp.menu_production_orders_start
|
||||
msgid "Production Orders To Start"
|
||||
msgstr "Ordres de Production à Commencer"
|
||||
msgstr "Ordres de production à lancer"
|
||||
|
||||
#. module: mrp
|
||||
#: view:mrp.procurement:0
|
||||
|
@ -1121,7 +1121,7 @@ msgstr ""
|
|||
#. module: mrp
|
||||
#: help:mrp.bom,routing_id:0
|
||||
msgid "The list of operations (list of workcenters) to produce the finnished product. The routing is mainly used to compute workcenter costs during operations and to plan futur loads on workcenters based on production plannification."
|
||||
msgstr "La liste des opérations (liste des Centres de Travail) pour produire le produit fini. L'acheminement est principalement utilisé pour calculer les coûts des centres de travail pendant les opérations et pour plannifier les charges futures sur les centres de travail basés sur la plannification de la production."
|
||||
msgstr "La liste des opérations (liste des Centres de Travail) pour produire le produit fini. La gamme est principalement utilisé pour calculer les coûts des centres de travail pendant les opérations et pour plannifier les charges futures sur les centres de travail basés sur la plannification de la production."
|
||||
|
||||
#. module: mrp
|
||||
#: model:process.transition,name:mrp.process_transition_producttostockrules0
|
||||
|
@ -1222,7 +1222,7 @@ msgstr ""
|
|||
#. module: mrp
|
||||
#: view:mrp.production.workcenter.line:0
|
||||
msgid "Production Workcenters"
|
||||
msgstr "Centre de Travail de Production"
|
||||
msgstr "Postes de charges"
|
||||
|
||||
#. module: mrp
|
||||
#: selection:mrp.procurement,state:0
|
||||
|
@ -1377,7 +1377,7 @@ msgstr "Ordres de Production en Marche"
|
|||
#: model:ir.ui.menu,name:mrp.menu_action_orderpoint_form
|
||||
#: view:stock.warehouse.orderpoint:0
|
||||
msgid "Minimum Stock Rules"
|
||||
msgstr "Règles de Stock Minimum"
|
||||
msgstr "Règles de stock minimum"
|
||||
|
||||
#. module: mrp
|
||||
#: help:mrp.workcenter,timesheet_id:0
|
||||
|
@ -1525,7 +1525,7 @@ msgstr "Nbre de cycles"
|
|||
#: model:ir.actions.act_window,name:mrp.mrp_bom_tree_action
|
||||
#: model:ir.ui.menu,name:mrp.menu_bom_tree
|
||||
msgid "Bill of Material Structure"
|
||||
msgstr "Structure de la Nomenclature"
|
||||
msgstr "Structure des Nomenclatures"
|
||||
|
||||
#. module: mrp
|
||||
#: field:mrp.bom,name:0
|
||||
|
@ -1548,7 +1548,7 @@ msgstr ""
|
|||
#. module: mrp
|
||||
#: model:ir.actions.wizard,name:mrp.wizard_workcenter_load
|
||||
msgid "Workcenter load"
|
||||
msgstr "Charge du Centre de Travail"
|
||||
msgstr "Charge par Poste"
|
||||
|
||||
#. module: mrp
|
||||
#: view:mrp.procurement:0
|
||||
|
@ -1606,7 +1606,7 @@ msgstr ""
|
|||
#: field:mrp.routing.workcenter,workcenter_id:0
|
||||
#: view:mrp.workcenter:0
|
||||
msgid "Workcenter"
|
||||
msgstr "Centre de Travail"
|
||||
msgstr "Poste de charge"
|
||||
|
||||
#. module: mrp
|
||||
#: help:mrp.workcenter,time_stop:0
|
||||
|
@ -1642,7 +1642,7 @@ msgstr ""
|
|||
#. module: mrp
|
||||
#: view:mrp.production:0
|
||||
msgid "Start Production"
|
||||
msgstr "Démarrer la Production"
|
||||
msgstr "Lancer la Production"
|
||||
|
||||
#. module: mrp
|
||||
#: wizard_field:mrp.workcenter.load,init,measure_unit:0
|
||||
|
|
|
@ -68,7 +68,7 @@ msgstr "Mettre en brouillon"
|
|||
#. module: mrp_operations
|
||||
#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_code_action
|
||||
msgid "Start - Stop Codes"
|
||||
msgstr ""
|
||||
msgstr "Codes de Début-Fin"
|
||||
|
||||
#. module: mrp_operations
|
||||
#: field:mrp_operations.operation.code,start_stop:0
|
||||
|
|
|
@ -616,7 +616,7 @@ msgstr "Réf. Commande"
|
|||
#: model:ir.actions.act_window,name:purchase.purchase_form_action
|
||||
#: model:ir.ui.menu,name:purchase.menu_purchase_form_action
|
||||
msgid "Purchase Orders"
|
||||
msgstr "Commandes d'achats"
|
||||
msgstr "Commandes fournisseurs"
|
||||
|
||||
#. module: purchase
|
||||
#: wizard_view:purchase.order.merge,init:0
|
||||
|
@ -633,7 +633,7 @@ msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactè
|
|||
#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
|
||||
#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
|
||||
msgid "New Purchase Order"
|
||||
msgstr "Nouvelles commandes d'achats"
|
||||
msgstr "Nouvelle commande fournisseur"
|
||||
|
||||
#. module: purchase
|
||||
#: field:purchase.order,shipped:0
|
||||
|
|
|
@ -923,7 +923,7 @@ msgstr "Méthod d'attribution"
|
|||
#. module: stock
|
||||
#: view:stock.picking:0
|
||||
msgid "Split in Two"
|
||||
msgstr "Diviser les lignes"
|
||||
msgstr "Diviser en deux"
|
||||
|
||||
#. module: stock
|
||||
#: field:stock.warehouse,lot_stock_id:0
|
||||
|
@ -1785,7 +1785,7 @@ msgstr ""
|
|||
#: model:ir.actions.act_window,name:stock.action_tracking_form
|
||||
#: model:ir.ui.menu,name:stock.menu_action_tracking_form
|
||||
msgid "Tracking Lots"
|
||||
msgstr "Tracer les lots"
|
||||
msgstr "Traçabilité logistique"
|
||||
|
||||
#. module: stock
|
||||
#: selection:stock.location,icon:0
|
||||
|
|
Loading…
Reference in New Issue