diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index cea696f590f..d4408d63bfe 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -23,7 +23,7 @@
{
"name" : "Accounting and Financial Management",
"version" : "1.1",
- "depends" : ["product", "analytic", "process"],
+ "depends" : ["product", "analytic", "process","board"],
"author" : "Tiny",
"category": 'Generic Modules/Accounting',
"description": """Financial and accounting module that covers:
@@ -34,6 +34,10 @@
Budgets
Customer and Supplier Invoices
Bank statements
+ Creates a dashboards for accountants that includes:
+ * List of uninvoiced quotations
+ * Graph of aged receivables
+ * Graph of aged incomes
The processes like maintaining of general ledger is done through the defined financial Journals (entry move line or
grouping is maintained through journal) for a particular financial year and for preparation of vouchers there is a
@@ -111,7 +115,8 @@ module named account_voucherss
'report/account_report_view.xml',
'report/account_analytic_report_view.xml',
'report/account_account_report_view.xml',
- 'report/account_analytic_entries_report_view.xml'
+ 'report/account_analytic_entries_report_view.xml',
+ 'board_account_view.xml',
],
'demo_xml': [
#'demo/price_accuracy00.yml',
@@ -120,6 +125,19 @@ module named account_voucherss
'project/analytic_account_demo.xml',
'demo/account_minimal.xml',
'account_unit_test.xml',
+ 'board_account_demo.xml',
+ ],
+ 'test': [
+ 'test/account_customer_invoice.yml',
+ 'test/account_supplier_invoice.yml',
+ 'test/account_change_currency.yml',
+ 'test/chart_of_account.yml',
+ 'test/account_period_close.yml',
+ 'test/account_fiscalyear_close_state.yml',
+ 'test/account_invoice_state.yml',
+ 'test/account_use_model.yml',
+ 'test/account_validate_account_move.yml',
+# 'test/account_fiscalyear_close.yml',
],
'installable': True,
'active': False,
diff --git a/addons/account/account.py b/addons/account/account.py
index 852e8e483f7..a6e3c09884a 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -62,7 +62,7 @@ class account_payment_term(osv.osv):
elif line.value == 'balance':
amt = round(amount, prec)
if amt:
- next_date = datetime.strptime(date_ref, '%y-%m-%d') + relativedelta(days=line.days)
+ next_date = datetime.strptime(date_ref, '%Y-%m-%d') + relativedelta(days=line.days)
if line.days2 < 0:
next_date += relativedelta(day=line.days2)
if line.days2 > 0:
@@ -183,7 +183,7 @@ class account_account(osv.osv):
temp.append(x)
ids2 += self._get_children_and_consol(cr, uid, temp, context)
return ids2
-
+
def search(self, cr, uid, args, offset=0, limit=None, order=None,
context=None, count=False):
if context is None:
@@ -320,7 +320,7 @@ class account_account(osv.osv):
level = obj.level + 1
res[account.id] = level
return res
-
+
_columns = {
'name': fields.char('Name', size=128, required=True, select=True),
'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
@@ -477,7 +477,7 @@ class account_account(osv.osv):
def _check_moves(self, cr, uid, ids, method, context):
line_obj = self.pool.get('account.move.line')
account_ids = self.search(cr, uid, [('id', 'child_of', ids)])
-
+
if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]):
if method == 'write':
raise osv.except_osv(_('Error !'), _('You cannot deactivate an account that contains account moves.'))
@@ -509,9 +509,14 @@ class account_account(osv.osv):
def write(self, cr, uid, ids, vals, context=None):
if context is None:
context = {}
+
+ if 'company_id' in vals:
+ move_lines = self.pool.get('account.move.line').search(cr, uid, [('account_id', 'in', ids)])
+ if move_lines:
+ raise osv.except_osv(_('Warning !'), _('You cannot modify Company of account as its related record exist in Entry Lines'))
if 'active' in vals and not vals['active']:
- self._check_moves(cr, uid, ids, "write", context)
- if 'type' in vals.keys():
+ self._check_moves(cr, uid, ids, "write", context=context)
+ if 'type' in vals.keys():
self._check_allow_type_change(cr, uid, ids, vals['type'], context=context)
return super(account_account, self).write(cr, uid, ids, vals, context=context)
@@ -557,42 +562,46 @@ class account_journal(osv.osv):
_name = "account.journal"
_description = "Journal"
_columns = {
- 'name': fields.char('Journal Name', size=64, required=True, translate=True),
- 'code': fields.char('Code', size=16),
- 'type': fields.selection([('sale', 'Sale'), ('purchase', 'Purchase'), ('cash', 'Cash'), ('general', 'General'), ('situation', 'Situation')], 'Type', size=32, required=True,
+ 'name': fields.char('Journal Name', size=64, required=True, translate=True,help="Name of the journal"),
+ 'code': fields.char('Code', size=16,required=True,help="Code of the journal"),
+ 'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'),('expense', 'Expense'), ('cash', 'Cash'), ('bank', 'Bank'), ('general', 'General'), ('situation', 'Situation')], 'Type', size=32, required=True,
help="Select 'Sale' for Sale journal to be used at the time of making invoice."\
" Select 'Purchase' for Purchase Journal to be used at the time of approving purchase order."\
" Select 'Cash' to be used at the time of making payment."\
" Select 'General' to be used at the time of stock input/output."\
" Select 'Situation' to be used at the time of making vouchers."),
'refund_journal': fields.boolean('Refund Journal', help='Fill this if the journal is to be used for refunds of invoices.'),
-
'type_control_ids': fields.many2many('account.account.type', 'account_journal_type_rel', 'journal_id','type_id', 'Type Controls', domain=[('code','<>','view'), ('code', '<>', 'closed')]),
'account_control_ids': fields.many2many('account.account', 'account_account_type_rel', 'journal_id','account_id', 'Account', domain=[('type','<>','view'), ('type', '<>', 'closed')]),
-
- 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the journal without removing it."),
- 'view_id': fields.many2one('account.journal.view', 'View', required=True, help="Gives the view used when writing or browsing entries in this journal. The view tells Open ERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."),
- 'default_credit_account_id': fields.many2one('account.account', 'Default Credit Account', domain="[('type','!=','view')]"),
- 'default_debit_account_id': fields.many2one('account.account', 'Default Debit Account', domain="[('type','!=','view')]"),
+ 'view_id': fields.many2one('account.journal.view', 'Display Mode', required=True, help="Gives the view used when writing or browsing entries in this journal. The view tells Open ERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."),
+ 'default_credit_account_id': fields.many2one('account.account', 'Default Credit Account', domain="[('type','!=','view')]",help="It acts as a default account for credit amount"),
+ 'default_debit_account_id': fields.many2one('account.account', 'Default Debit Account', domain="[('type','!=','view')]",help="It acts as a default account for debit amount"),
'centralisation': fields.boolean('Centralised counterpart', help="Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."),
- 'update_posted': fields.boolean('Allow Cancelling Entries'),
+ 'update_posted': fields.boolean('Allow Cancelling Entries',help="Check this box if you want to cancel the entries related to this journal or want to cancel the invoice related to this journal"),
'group_invoice_lines': fields.boolean('Group invoice lines', help="If this box is checked, the system will try to group the accounting lines when generating them from invoices."),
'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="The sequence gives the display order for a list of journals", required=True),
'user_id': fields.many2one('res.users', 'User', help="The user responsible for this journal"),
'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'),
'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
'entry_posted': fields.boolean('Skip \'Draft\' State for Created Entries', help='Check this box if you don\'t want new account moves to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation.'),
- 'company_id': fields.many2one('res.company', 'Company', required=True,select=1),
+ 'company_id': fields.many2one('res.company', 'Company', required=True,select=1,help="Company associated with a journal"),
'invoice_sequence_id': fields.many2one('ir.sequence', 'Invoice Sequence', \
help="The sequence used for invoice numbers in this journal."),
'allow_date':fields.boolean('Check Date not in the Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),
}
_defaults = {
- 'active': lambda *a: 1,
'user_id': lambda self,cr,uid,context: uid,
'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
}
+ def write(self, cr, uid, ids, vals, context=None):
+ obj=[]
+ if 'company_id' in vals:
+ move_lines = self.pool.get('account.move.line').search(cr, uid, [('journal_id', 'in', ids)])
+ if move_lines:
+ raise osv.except_osv(_('Warning !'), _('You cannot modify company of this journal as its related record exist in Entry Lines'))
+ return super(account_journal, self).write(cr, uid, ids, vals, context=context)
+
def create(self, cr, uid, vals, context={}):
journal_id = super(account_journal, self).create(cr, uid, vals, context)
# journal_name = self.browse(cr, uid, [journal_id])[0].code
@@ -618,6 +627,16 @@ class account_journal(osv.osv):
ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context)
return self.name_get(cr, user, ids, context=context)
+ def onchange_type(self, cr, uid, ids, type):
+ res={}
+ for line in self.browse(cr, uid, ids):
+ if type == 'situation':
+ res= {'value':{'centralisation': True}}
+ else:
+ res= {'value':{'centralisation': False}}
+ return res
+
+
account_journal()
class account_fiscalyear(osv.osv):
@@ -683,7 +702,7 @@ class account_fiscalyear(osv.osv):
else:
return False
return ids[0]
-
+
def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
if args is None:
args = []
@@ -695,7 +714,7 @@ class account_fiscalyear(osv.osv):
if not ids:
ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
return self.name_get(cr, user, ids, context=context)
-
+
account_fiscalyear()
class account_period(osv.osv):
@@ -711,7 +730,7 @@ class account_period(osv.osv):
'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True),
'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True,
help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'),
- 'company_id': fields.many2one('res.company', 'Company', required=True)
+ 'company_id': fields.related('fiscalyear_id','company_id',type='many2one',relation='res.company',string='Company',store=True)
}
_defaults = {
'state': lambda *a: 'draft',
@@ -771,7 +790,7 @@ class account_period(osv.osv):
cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id))
cr.execute('update account_period set state=%s where id=%s', (mode, id))
return True
-
+
def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
if args is None:
args = []
@@ -784,6 +803,14 @@ class account_period(osv.osv):
ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
return self.name_get(cr, user, ids, context=context)
+ def write(self, cr, uid, ids, vals, context=None):
+ obj=[]
+ if 'company_id' in vals:
+ move_lines = self.pool.get('account.move.line').search(cr, uid, [('period_id', 'in', ids)])
+ if move_lines:
+ raise osv.except_osv(_('Warning !'), _('You cannot modify company of this period as its related record exist in Entry Lines'))
+ return super(account_period, self).write(cr, uid, ids, vals, context=context)
+
account_period()
class account_journal_period(osv.osv):
@@ -809,7 +836,7 @@ class account_journal_period(osv.osv):
'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'State', required=True, readonly=True,
help='When journal period is created. The state is \'Draft\'. If a report is printed it comes to \'Printed\' state. When all transactions are done, it comes in \'Done\' state.'),
'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', string='Fiscal Year', type='many2one', relation='account.fiscalyear'),
- 'company_id' : fields.many2one('res.company', 'Company')
+ 'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company')
}
def _check(self, cr, uid, ids, context={}):
@@ -927,7 +954,7 @@ class account_move(osv.osv):
('journal_sale_vou','Journal Sale'),
('journal_pur_voucher','Journal Purchase'),
('journal_voucher','Journal Voucher'),
- ],'Type', readonly=True, select=True, states={'draft':[('readonly',False)]}),
+ ],'Entry Type', select=True , size=128, readonly=True, states={'draft':[('readonly',False)]}),
'narration':fields.text('Narration', readonly=True, select=True, states={'draft':[('readonly',False)]}),
'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company',store=True),
}
@@ -1375,7 +1402,7 @@ class account_tax_code(osv.osv):
return False
level -= 1
return True
-
+
def copy(self, cr, uid, id, default=None, context=None):
if default is None:
@@ -1383,7 +1410,7 @@ class account_tax_code(osv.osv):
default = default.copy()
default.update({'line_ids': []})
return super(account_tax_code, self).copy(cr, uid, id, default, context)
-
+
_constraints = [
(_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id'])
]
@@ -1441,6 +1468,7 @@ class account_tax(osv.osv):
'include_base_amount': fields.boolean('Included in base amount', help="Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"),
'company_id': fields.many2one('res.company', 'Company', required=True),
'description': fields.char('Tax Code',size=32),
+ 'price_include': fields.boolean('Tax Included in Price', help="Check this if the price you use on the product and invoices includes this tax."),
'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Application', required=True)
}
@@ -1473,6 +1501,7 @@ class account_tax(osv.osv):
'applicable_type': lambda *a: 'true',
'type': lambda *a: 'percent',
'amount': lambda *a: 0,
+ 'price_include': lambda *a: 0,
'active': lambda *a: 1,
'type_tax_use': lambda *a: 'all',
'sequence': lambda *a: 1,
@@ -1565,8 +1594,42 @@ class account_tax(osv.osv):
cur_price_unit+=amount2
return res
- def compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+ def compute_all(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+ """
+ RETURN: {
+ 'total': 0.0, # Total without taxes
+ 'total_included: 0.0, # Total with taxes
+ 'taxes': [] # List of taxes, see compute for the format
+ }
+ """
+ precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
+ totalin = totalex = round(price_unit * quantity, precision)
+ tin = []
+ tex = []
+ for tax in taxes:
+ if tax.price_include:
+ tin.append(tax)
+ else:
+ tex.append(tax)
+ tin = self.compute_inv(cr, uid, tin, price_unit, quantity, address_id=address_id, product=product, partner=partner)
+ for r in tin:
+ totalex -= r['amount']
+ tex = self._compute(cr, uid, tex, totalex/quantity, quantity, address_id=address_id, product=product, partner=partner)
+ for r in tex:
+ totalin += r['amount']
+ return {
+ 'total': totalex,
+ 'total_included': totalin,
+ 'taxes': tin + tex
+ }
+ def compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+ logger = netsvc.Logger()
+ logger.notifyChannel("warning", netsvc.LOG_WARNING,
+ "Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included")
+ return self._compute(cr, uid, taxes, price_unit, quantity, address_id, product, partner)
+
+ def _compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
"""
Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
@@ -1583,7 +1646,6 @@ class account_tax(osv.osv):
else:
r['amount'] = round(r['amount'] * quantity, self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
total += r['amount']
-
return res
def _unit_compute_inv(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None):
@@ -1963,13 +2025,12 @@ class account_add_tmpl_wizard(osv.osv_memory):
if not tids or not tids[0]['parent_id']:
return False
ptids = tmpl_obj.read(cr, uid, [tids[0]['parent_id'][0]],['code'])
+ res = None
if not ptids or not ptids[0]['code']:
raise osv.except_osv(_('Error !'), _('Cannot locate parent code for template account!'))
res = acc_obj.search(cr,uid,[('code','=',ptids[0]['code'])])
- if res:
- return res[0]
- else:
- return False
+
+ return res and res[0] or False
_columns = {
'cparent_id':fields.many2one('account.account', 'Parent target', help="Creates an account with the selected template under this existing parent.", required=True),
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 4c6faae9e19..50e431935bc 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -19,26 +19,26 @@
position="attributes">
You can enhance OpenERP's basic accounting support with a few additional OpenERP applications.
-
+ Configure23
-
-
-
+
+
+
-
+
-
-
-
-
-
+
+
-
-
-
-
-
+
+
+
+
+
@@ -88,12 +88,12 @@
account_installer_action_replacetree
-
-
-
+
+
+
-
+
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 77369bdca25..bceb1b3c857 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -53,7 +53,7 @@
-
+
@@ -63,6 +63,7 @@
+
@@ -146,7 +147,7 @@
-
+
@@ -192,7 +193,7 @@
-
+
@@ -201,12 +202,12 @@
-
+
-
-
+
+
-
+
@@ -219,7 +220,8 @@
-
+
+
@@ -255,7 +257,7 @@
-
+
@@ -285,7 +287,7 @@
-
+
@@ -294,11 +296,11 @@
-
-
+
+
-
+
@@ -345,9 +347,9 @@
-
-
-
+
+
+
@@ -356,16 +358,16 @@
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
@@ -403,7 +405,7 @@
-
+
Customer Invoices
@@ -426,10 +428,10 @@
-
+
- Supplier Invoices
+ Vendor Invoicesaccount.invoiceformtree,form,calendar,graph
@@ -438,7 +440,7 @@
{'type':'in_invoice'}
-
+
Customer Refunds
@@ -464,10 +466,10 @@
-
+
- Supplier Refunds
+ Vendor Refundsaccount.invoiceformtree,form,calendar,graph
@@ -476,7 +478,7 @@
{'type':'in_refund'}
-
+
@@ -486,20 +488,5 @@
-
-
-
- res.partner.invoice.info.inherit
- res.partner
- form
-
-
-
-
-
-
-
-
-
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index a2d18095618..d0ae2ccc58f 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -1,28 +1,52 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
-
-
+
+
+
+
-
+
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 36b65d20dca..c599c7c4447 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -498,9 +498,17 @@ class account_move_line(osv.osv):
return False
return True
+ def _check_company_id(self, cr, uid, ids):
+ lines = self.browse(cr, uid, ids)
+ for l in lines:
+ if l.company_id != l.account_id.company_id or l.company_id != l.period_id.company_id:
+ return False
+ return True
+
_constraints = [
(_check_no_view, 'You can not create move line on view account.', ['account_id']),
(_check_no_closed, 'You can not create move line on closed account.', ['account_id']),
+ (_check_company_id,'Company must be same for its related account and period.',['company_id'] ),
]
#TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id
@@ -530,9 +538,8 @@ class account_move_line(osv.osv):
date = datetime.now().strftime('%Y-%m-%d')
part = self.pool.get('res.partner').browse(cr, uid, partner_id)
- if part.property_payment_term and part.property_payment_term.line_ids:
- payterm = part.property_payment_term.line_ids[0]
- res = self.pool.get('account.payment.term').compute(cr, uid, payterm.id, 100, date)
+ if part.property_payment_term:
+ res = self.pool.get('account.payment.term').compute(cr, uid, part.property_payment_term.id, 100, date)
if res:
val['date_maturity'] = res[0][0]
if not account_id:
@@ -540,10 +547,10 @@ class account_move_line(osv.osv):
id2 = part.property_account_receivable.id
if journal:
jt = self.pool.get('account.journal').browse(cr, uid, journal).type
- if jt=='sale':
+ if jt == 'sale':
val['account_id'] = self.pool.get('account.fiscal.position').map_account(cr, uid, part and part.property_account_position or False, id2)
- elif jt=='purchase':
+ elif jt == 'purchase':
val['account_id'] = self.pool.get('account.fiscal.position').map_account(cr, uid, part and part.property_account_position or False, id1)
if val.get('account_id', False):
d = self.onchange_account_id(cr, uid, ids, val['account_id'])
@@ -570,11 +577,21 @@ class account_move_line(osv.osv):
# writeoff; entry generated for the difference between the lines
#
- def reconcile_partial(self, cr, uid, ids, type='auto', context={}):
+ def reconcile_partial(self, cr, uid, ids, type='auto', context=None):
merges = []
unmerge = []
total = 0.0
merges_rec = []
+
+ company_list = []
+ if context is None:
+ context = {}
+
+ for line in self.browse(cr, uid, ids, context=context):
+ if company_list and not line.company_id.id in company_list:
+ raise osv.except_osv(_('Warning !'), _('To reconcile the entries company should be the same for all entries'))
+ company_list.append(line.company_id.id)
+
for line in self.browse(cr, uid, ids, context):
if line.reconcile_id:
raise osv.except_osv(_('Warning'), _('Already Reconciled!'))
@@ -588,6 +605,7 @@ class account_move_line(osv.osv):
else:
unmerge.append(line.id)
total += (line.debit or 0.0) - (line.credit or 0.0)
+
if not total:
res = self.reconcile(cr, uid, merges+unmerge, context=context)
return res
@@ -598,13 +616,22 @@ class account_move_line(osv.osv):
self.pool.get('account.move.reconcile').reconcile_partial_check(cr, uid, [r_id] + merges_rec, context=context)
return True
- def reconcile(self, cr, uid, ids, type='auto', writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False, context={}):
+ def reconcile(self, cr, uid, ids, type='auto', writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False, context=None):
lines = self.browse(cr, uid, ids, context=context)
unrec_lines = filter(lambda x: not x['reconcile_id'], lines)
credit = debit = 0.0
currency = 0.0
account_id = False
partner_id = False
+ if context is None:
+ context = {}
+
+ company_list = []
+ for line in self.browse(cr, uid, ids, context=context):
+ if company_list and not line.company_id.id in company_list:
+ raise osv.except_osv(_('Warning !'), _('To reconcile the entries company should be the same for all entries'))
+ company_list.append(line.company_id.id)
+
for line in unrec_lines:
if line.state <> 'valid':
raise osv.except_osv(_('Error'),
@@ -837,7 +864,7 @@ class account_move_line(osv.osv):
if vals.get('date', False):
todo_date = vals['date']
del vals['date']
-
+
for line in self.browse(cr, uid, ids,context=context):
ctx = context.copy()
if ('journal_id' not in ctx):
@@ -849,8 +876,8 @@ class account_move_line(osv.osv):
if line.move_id:
ctx['period_id'] = line.move_id.period_id.id
else:
- ctx['period_id'] = line.period_id.id
- #Check for centralisation
+ ctx['period_id'] = line.period_id.id
+ #Check for centralisation
journal = self.pool.get('account.journal').browse(cr, uid, ctx['journal_id'], context=ctx)
if journal.centralisation:
self._check_moves(cr, uid, context=ctx)
diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 656d9d2f595..6480178d1ae 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -23,7 +23,7 @@
-
+
-
+
-
+
-
+
@@ -607,7 +610,7 @@
-
+
+ id="menu_action_account_bank_reconcile_check_tree"
+ parent="account.next_id_30" />
- Models Definition
+ Define Modelsaccount.modelformtree,form
-
+
Running Subscriptions
@@ -1491,8 +1554,8 @@
-
-
+
+ Account Add wizard
@@ -1515,14 +1578,24 @@
res_model="account.addtmpl.wizard"
context="{'tmpl_ids': active_id}"
src_model="account.account.template"
- view_type="form" view_mode="form"/>
+ view_type="form" view_mode="form"/>
+
+
@@ -1573,7 +1646,7 @@
-
+
@@ -1618,7 +1691,7 @@
tree,form
-
+
@@ -1694,7 +1767,7 @@
tree,form
-
+
@@ -1732,7 +1805,7 @@
formtree,form
-
+
@@ -1748,17 +1821,17 @@
Generate Chart of Accounts from a Chart Template
- Generate Chart of Accounts from a Chart Template
-
-
- This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template
- 150
-
-
- 15
-
-
+
+
+ This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template
+ 150
+
+
+ 15
+
+
@@ -1779,7 +1852,6 @@
-
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 8b093fb2310..f71c81b48ca 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -33,7 +33,7 @@
-->
-
+
diff --git a/addons/board_account/board_account_demo.xml b/addons/account/board_account_demo.xml
similarity index 98%
rename from addons/board_account/board_account_demo.xml
rename to addons/account/board_account_demo.xml
index 9870338e9ee..98eb64cb411 100644
--- a/addons/board_account/board_account_demo.xml
+++ b/addons/account/board_account_demo.xml
@@ -1,7 +1,6 @@
-
-
- res.partner.account.info.inherit
- res.partner
- form
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml
index b9710276509..fd1b65708b2 100644
--- a/addons/account/process/customer_invoice_process.xml
+++ b/addons/account/process/customer_invoice_process.xml
@@ -39,7 +39,7 @@
-
+
diff --git a/addons/account/process/supplier_invoice_process.xml b/addons/account/process/supplier_invoice_process.xml
index 26e1e9862e7..080cc5cb984 100644
--- a/addons/account/process/supplier_invoice_process.xml
+++ b/addons/account/process/supplier_invoice_process.xml
@@ -39,7 +39,7 @@
-
+
diff --git a/addons/account/project/project.py b/addons/account/project/project.py
index a844d6dec2e..c88290b7021 100644
--- a/addons/account/project/project.py
+++ b/addons/account/project/project.py
@@ -46,7 +46,7 @@ class account_journal(osv.osv):
_inherit="account.journal"
_columns = {
- 'analytic_journal_id':fields.many2one('account.analytic.journal','Analytic Journal'),
+ 'analytic_journal_id':fields.many2one('account.analytic.journal','Analytic Journal',help="Journal for analytic entries"),
}
account_journal()
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index b4a7b67a05a..067fbd38ab1 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -25,8 +25,8 @@
-
-
+
+
@@ -101,7 +101,7 @@
-
+
Accounts to Renew
@@ -114,7 +114,7 @@
- Analytic Chart of Accounts
+ Chart of Analytic Accountsir.actions.act_windowaccount.analytic.account[('parent_id','=',False)]
@@ -122,10 +122,10 @@
form,graph
-
+
+
+
+
+
-
+
+
+
+
Analytic Entries
@@ -293,31 +293,49 @@
- Analytic Journal Definition
+ Analytic Journalsaccount.analytic.journalformtree,form
-
+
#
# Open journal entries
#
- Entries of Open Analytic Journals
+ Analytic Journal Itemsaccount.analytic.lineformtree,form[('journal_id','=',active_id)]
-
-
-
- Open Analytic Journal
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
#
# Reporting
@@ -331,13 +349,13 @@
-
- Analytic Entries by Journal
- account.analytic.journal
- tree
-
-
-
+
+
+
+
+
+
+
#
# Statistics
@@ -396,8 +414,8 @@
-
-
+
+
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
index 73dd38533c4..527b6f02f84 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
@@ -55,51 +55,3 @@ class account_analytic_cost_ledger_journal_report(osv.osv_memory):
account_analytic_cost_ledger_journal_report()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
-#import time
-#import wizard
-#
-#_form = '''
-#'''
-#
-#_fields = {
-# 'date1': {'string':'Start of period', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')},
-# 'date2': {'string':'End of period', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
-# 'journal': {'string':'Journals','type':'many2many', 'relation':'account.analytic.journal'},
-#}
-#
-#
-#class wizard_report(wizard.interface):
-# states = {
-# 'init': {
-# 'actions': [],
-# 'result': {
-# 'type': 'form',
-# 'arch': _form,
-# 'fields': _fields,
-# 'state': [
-# ('end','Cancel'),
-# ('report','Print')
-# ]
-# }
-# },
-# 'report': {
-# 'actions': [],
-# 'result': {
-# 'type': 'print',
-# 'report': 'account.analytic.account.quantity_cost_ledger',
-# 'state': 'end'
-# }
-# },
-# }
-#
-#wizard_report('account.analytic.account.quantity_cost_ledger.report')
-#
-## vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/project/wizard/project_account_analytic_line.py b/addons/account/project/wizard/project_account_analytic_line.py
index d84c199ff40..dbe3df3c819 100644
--- a/addons/account/project/wizard/project_account_analytic_line.py
+++ b/addons/account/project/wizard/project_account_analytic_line.py
@@ -32,26 +32,26 @@ class project_account_analytic_line(osv.osv_memory):
def action_open_window(self, cr, uid, ids, context={}):
mod_obj =self.pool.get('ir.model.data')
domain = []
- for data in self.read(cr, uid, ids, context=context):
- from_date = data['from_date']
- to_date = data['to_date']
- if from_date and to_date:
- domain = [('date','>=',from_date), ('date','<=',to_date)]
- elif from_date:
- domain = [('date','>=',from_date)]
- elif to_date:
- domain = [('date','<=',to_date)]
- result = mod_obj._get_id(cr, uid, 'account', 'view_account_analytic_line_filter')
- id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
- return {
- 'name': _('Analytic Entries by line'),
- 'view_type': 'form',
- "view_mode": 'tree,form',
- 'res_model': 'account.analytic.line',
- 'type': 'ir.actions.act_window',
- 'domain': domain,
- 'search_view_id': id['res_id'],
- }
+ data = self.read(cr, uid, ids, [])[0]
+ from_date = data['from_date']
+ to_date = data['to_date']
+ if from_date and to_date:
+ domain = [('date','>=',from_date), ('date','<=',to_date)]
+ elif from_date:
+ domain = [('date','>=',from_date)]
+ elif to_date:
+ domain = [('date','<=',to_date)]
+ result = mod_obj._get_id(cr, uid, 'account', 'view_account_analytic_line_filter')
+ id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
+ return {
+ 'name': _('Analytic Entries by line'),
+ 'view_type': 'form',
+ "view_mode": 'tree,form',
+ 'res_model': 'account.analytic.line',
+ 'type': 'ir.actions.act_window',
+ 'domain': domain,
+ 'search_view_id': id['res_id'],
+ }
project_account_analytic_line()
diff --git a/addons/account/project/wizard/project_account_analytic_line_view.xml b/addons/account/project/wizard/project_account_analytic_line_view.xml
index 96d9186cfa8..d564ffb5c81 100644
--- a/addons/account/project/wizard/project_account_analytic_line_view.xml
+++ b/addons/account/project/wizard/project_account_analytic_line_view.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py
index 0afffa24417..ad965e04b57 100644
--- a/addons/account/report/__init__.py
+++ b/addons/account/report/__init__.py
@@ -30,8 +30,7 @@ import invoice
import overdue
import aged_trial_balance
import tax_report
-import general_ledger_landscape
-import account_tax_code
+#import account_tax_code
import account_balance_landscape
import compare_account_balance
import account_invoice_report
diff --git a/addons/account/report/account_account_report_view.xml b/addons/account/report/account_account_report_view.xml
index f2d6338c951..bd9101a3382 100644
--- a/addons/account/report/account_account_report_view.xml
+++ b/addons/account/report/account_account_report_view.xml
@@ -6,7 +6,7 @@
account.account.reporttree
-
+
@@ -29,7 +29,7 @@
account.account.reportgraph
-
+
@@ -43,35 +43,36 @@
account.account.reportsearch
-
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
-
+
@@ -79,7 +80,7 @@
- Accounts
+ Accounts Analysisaccount.account.reportformtree,graph
@@ -87,7 +88,7 @@
-
+
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index e1cd7967b8d..3b9e3ec193e 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -6,14 +6,14 @@
analytic.entries.reporttree
-
+
-
+
@@ -33,55 +33,54 @@
analytic.entries.reportsearch
-
+
-
-
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
+
+
-
-
-
+
+
+
-
@@ -90,7 +89,7 @@
analytic.entries.reportgraph
-
+
@@ -99,7 +98,7 @@
- Analytic Entries
+ Analytic Entries Analysisanalytic.entries.reportformtree,graph
@@ -107,7 +106,7 @@
-
+
diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml
index 9a60b8a7bd0..070b3a8c10a 100644
--- a/addons/account/report/account_analytic_report_view.xml
+++ b/addons/account/report/account_analytic_report_view.xml
@@ -6,7 +6,7 @@
analytic.reporttree
-
+
@@ -19,9 +19,9 @@
-
-
-
+
+
+
@@ -34,85 +34,68 @@
analytic.reportsearch
-
+
-
-
-
+
+
+
-
-
-
+
+
-
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -122,7 +105,7 @@
analytic.reportgraph
-
+
@@ -132,14 +115,14 @@
- Analytic Accounts
+ Analytic Accounts Analysisanalytic.reportformtree,graph{'search_default_This Month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}
-
+
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index e4731e2c994..78683b5120b 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -22,9 +22,15 @@
import xml
import copy
from operator import itemgetter
-import time
import datetime
from report import report_sxw
+import xml.dom.minidom
+import os, time
+import osv
+import re
+import tools
+import pooler
+import sys
class account_balance(report_sxw.rml_parse):
_name = 'report.account.account.balance'
@@ -44,6 +50,10 @@ class account_balance(report_sxw.rml_parse):
})
self.context = context
+ def _add_header(self, node, header=1):
+ if header==0:
+ self.rml_header = ""
+ return True
def get_fiscalyear(self, form):
res=[]
if form.has_key('fiscalyear'):
@@ -56,16 +66,14 @@ class account_balance(report_sxw.rml_parse):
def get_periods(self, form):
result=''
- if form.has_key('periods') and form['periods'][0][2]:
- period_ids = form['periods'][0][2]
- self.cr.execute("select name from account_period where id =ANY(%s)" ,(period_ids))
- res = self.cr.fetchall()
- len_res = len(res)
- for r in res:
- if (r == res[len_res-1]):
- result+=r[0]+". "
+ if form.has_key('periods') and form['periods']:
+ period_ids = form['periods']
+ per_ids = self.pool.get('account.period').browse(self.cr,self.uid,form['periods'])
+ for r in per_ids:
+ if r == per_ids[len(per_ids)-1]:
+ result+=r.name+". "
else:
- result+=r[0]+", "
+ result+=r.name+", "
else:
fy_obj = self.pool.get('account.fiscalyear').browse(self.cr,self.uid,form['fiscalyear'])
res = fy_obj.period_ids
@@ -172,5 +180,8 @@ class account_balance(report_sxw.rml_parse):
def _sum_debit(self):
return self.sum_debit
-report_sxw.report_sxw('report.account.account.balance', 'account.account', 'addons/account/report/account_balance.rml', parser=account_balance, header=False)
+
+
+
+report_sxw.report_sxw('report.account.account.balance', 'account.account', 'addons/account/report/account_balance.rml', parser=account_balance, header=0)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index fb8eb53c418..af4cee7a7ba 100644
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@@ -66,6 +66,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -95,6 +116,8 @@
+
+
@@ -141,14 +164,46 @@
-
+
+
- [[ get_fiscalyear(data['form']) or removeParentNode('para') ]]:
- [[ get_periods(data['form']) or removeParentNode('para') ]]
+ Fiscal Year
+
+
+ End Date
+
+
+ Start Date
+
+
+ Display Account
+
+
+ Periods
-
+
+
+
+
+ [[ get_fiscalyear(data['form']) ]]
+
+
+ [[ data['form']['date_from'] ]]
+
+
+ [[ data['form']['date_to'] ]]
+
+
+ [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_mouvement' and 'With movements') or 'With balance is not equal to 0']]
+
+
+ [[data['form']['periods'] and get_periods(data['form']) or '']]
+
+
+
+
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 625d98fa9cb..5645c34d20c 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -6,7 +6,7 @@
account.entries.reporttree
-
+
@@ -37,7 +37,7 @@
account.entries.reportgraph
-
+
@@ -48,80 +48,79 @@
account.entries.reportsearch
-
+
-
-
+
-
+
+ help = "Draft entries"/>
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
+
- Entries
+ Entries Analysisaccount.entries.reportformtree,graph{'search_default_This Month':1,'search_default_Journal':1,'group_by_no_leaf':1,'group_by':[]}
-
+
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index cd1477e79cf..1fb90a86bec 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -36,10 +36,12 @@ class account_invoice_report(osv.osv):
('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
'product_id':fields.many2one('product.product', 'Product', readonly=True),
'product_qty':fields.float('Qty', readonly=True),
+ 'uom_name': fields.char('Default UoM', size=128, readonly=True),
'payment_term': fields.many2one('account.payment.term', 'Payment Term',readonly=True),
'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')],readonly=True),
'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position',readonly=True),
'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
+ 'categ_id': fields.many2one('product.category','Category of Product', readonly=True),
'journal_id': fields.many2one('account.journal', 'Journal',readonly=True),
'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
'company_id':fields.many2one('res.company', 'Company', readonly=True),
@@ -47,6 +49,7 @@ class account_invoice_report(osv.osv):
'price_total':fields.float('Total Price', readonly=True),
'price_average':fields.float('Average Price', readonly=True),
'nbr':fields.integer('# of Lines', readonly=True),
+ 'reconciled':fields.integer('# reconciled lines', readonly=True),
'type': fields.selection([
('out_invoice','Customer Invoice'),
('in_invoice','Supplier Invoice'),
@@ -60,7 +63,7 @@ class account_invoice_report(osv.osv):
('open','Open'),
('paid','Done'),
('cancel','Cancelled')
- ], 'Order State', readonly=True),
+ ], 'Invoice State', readonly=True),
'date_due': fields.date('Due Date', readonly=True),
'address_contact_id': fields.many2one('res.partner.address', 'Contact Address Name', readonly=True),
'address_invoice_id': fields.many2one('res.partner.address', 'Invoice Address Name', readonly=True),
@@ -81,46 +84,66 @@ class account_invoice_report(osv.osv):
to_char(s.date_invoice, 'MM') as month,
to_char(s.date_invoice, 'YYYY-MM-DD') as day,
l.product_id as product_id,
- sum(l.quantity * u.factor) as product_qty,
+ sum(case when s.type in ('out_refund','in_invoice') then
+ l.quantity * u.factor * -1
+ else
+ l.quantity * u.factor
+ end) as product_qty,
s.partner_id as partner_id,
+ s.reconciled::integer,
s.payment_term as payment_term,
s.period_id as period_id,
+ u.name as uom_name,
s.currency_id as currency_id,
s.journal_id as journal_id,
s.fiscal_position as fiscal_position,
s.user_id as user_id,
s.company_id as company_id,
- sum(l.quantity*l.price_unit) as price_total,
- (sum(l.quantity*l.price_unit)/sum(l.quantity * u.factor))::decimal(16,2) as price_average,
+ sum(case when s.type in ('out_refund','in_invoice') then
+ l.quantity*l.price_unit * -1
+ else
+ l.quantity*l.price_unit
+ end) as price_total,
+ sum(case when s.type in ('out_refund','in_invoice') then
+ l.quantity*l.price_unit * -1
+ else
+ l.quantity*l.price_unit
+ end) / sum(l.quantity * u.factor)::decimal(16,2) as price_average,
count(*) as nbr,
s.type as type,
s.state,
+ pt.categ_id,
s.date_due as date_due,
s.address_contact_id as address_contact_id,
s.address_invoice_id as address_invoice_id,
s.account_id as account_id,
s.partner_bank as partner_bank,
- s.residual as residual,
+ sum(case when s.type in ('out_refund','in_invoice') then
+ s.residual * -1
+ else
+ s.residual
+ end) as residual,
case when s.state != 'paid' then null else
- extract(epoch from avg(am.date_created-l.create_date))/(24*60*60)::decimal(16,2)
+ extract(epoch from avg(am.date_created-l.create_date))/(24*60*60)::decimal(16,2)
end as delay_to_pay
- from
- account_invoice_line l
- left join
- account_invoice s on (s.id=l.invoice_id)
- left join product_uom u on (u.id=l.uos_id),
+ from account_invoice_line l
+ left join account_invoice s on (s.id=l.invoice_id)
+ left join product_template pt on (pt.id=l.product_id)
+ left join product_uom u on (u.id=l.uos_id),
account_move_line am left join account_invoice i on (i.move_id=am.move_id)
- where
- am.account_id=i.account_id
+ where am.account_id=i.account_id
group by
s.type,
s.date_invoice,
s.partner_id,
l.product_id,
+ u.name,
l.uos_id,
+ s.reconciled,
s.user_id,
s.state,
s.residual,
+ pt.categ_id,
s.company_id,
s.payment_term,
s.period_id,
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index ae00608b164..448f2abaf6d 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -6,7 +6,7 @@
account.invoice.reporttree
-
+
@@ -16,21 +16,22 @@
-
+
+
-
-
+
-
-
-
+
+
+
+
@@ -42,7 +43,7 @@
account.invoice.reportgraph
-
+
@@ -54,104 +55,95 @@
account.invoice.reportsearch
-
+
-
-
-
-
+
+ help = "Pro-forma Invoices"/>
+ help = "open Invoices"/>
-
-
+ help = "Done Invoices"/>
+
+
-
+
-
-
-
-
+
+
+
+
-
-
-
+
+
-
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
- Invoices
+ Invoices Analysisaccount.invoice.reportformtree,graph
- {'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[],'search_default_user_id':uid}
+ {'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}
-
+
diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml
index 9b1688730aa..190ff856c8a 100644
--- a/addons/account/report/account_report_view.xml
+++ b/addons/account/report/account_report_view.xml
@@ -153,8 +153,8 @@
search
-
-
+
+
@@ -221,8 +221,8 @@
search
-
-
+
+
diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py
index 00031a77ed8..e2c24fe96d2 100644
--- a/addons/account/report/general_ledger.py
+++ b/addons/account/report/general_ledger.py
@@ -33,8 +33,6 @@ import pooler
class general_ledger(rml_parse.rml_parse):
_name = 'report.account.general.ledger'
-
-
def set_context(self, objects, data, ids, report_type = None):
##
self.borne_date = self.get_min_date(data['form'])
@@ -42,6 +40,7 @@ class general_ledger(rml_parse.rml_parse):
new_ids = []
if (data['model'] == 'account.account'):
new_ids = 'active_ids' in data['form']['context'] and data['form']['context']['active_ids'] or []
+ #new_ids = ids
else:
new_ids.append(data['form']['Account_list'])
@@ -70,39 +69,6 @@ class general_ledger(rml_parse.rml_parse):
'sum_currency_amount_account': self._sum_currency_amount_account
})
self.context = context
- def _calc_contrepartie(self,cr,uid,ids, context={}):
- result = {}
- #for id in ids:
- # result.setdefault(id, False)
-
- for account_line in self.pool.get('account.move.line').browse(cr, uid, ids, context):
- # For avoid long text in the field we will limit it to 5 lines
- #
- #
- #
- result[account_line.id] = ' '
- num_id_move = str(account_line.move_id.id)
- num_id_line = str(account_line.id)
- account_id = str(account_line.account_id.id)
- # search the basic account
- # We have the account ID we will search all account move line from now until this time
- # We are in the case of we are on the top of the account move Line
- cr.execute('SELECT distinct(ac.code) as code_rest,ac.name as name_rest from account_account AS ac, account_move_line mv\
- where ac.id = mv.account_id and mv.move_id = %s and mv.account_id <> %s' ,(num_id_move,account_id,))
- res_mv = cr.dictfetchall()
- # we need a result more than 2 line to make the test so we will made the the on 1 because we have exclude the current line
- if (len(res_mv) >=1):
- concat = ''
- rup_id = 0
- for move_rest in res_mv:
- concat = concat + move_rest['code_rest'] + '|'
- result[account_line.id] = concat
- if rup_id >5:
- # we need to stop the computing and to escape but before we will add "..."
- result[account_line.id] = concat + '...'
- break
- rup_id+=1
- return result
def get_min_date(self,form):
@@ -118,12 +84,17 @@ class general_ledger(rml_parse.rml_parse):
if form['state'] == 'byperiod':
## This function will return the most aged date
periods = form['periods']
+ #periods = form['periods'][0][2]
if not periods:
- self.cr.execute("""
- Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = %s""",(form['fiscalyear'],))
+ 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:
- self.cr.execute("""
- Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id =ANY(%s)""",(periods,))
+ 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()
borne_min = res[0]['start_date']
borne_max = res[0]['stop_date']
@@ -132,15 +103,17 @@ class general_ledger(rml_parse.rml_parse):
borne_max = form['date_to']
elif form['state'] == 'all':
periods = form['periods']
+ #periods = form['periods'][0][2]
if not periods:
- if form['fiscalyear'] == False:
- fiscalyears = self.pool.get('account.fiscalyear').search(self.cr, self.uid, [('state', '=', 'draft')])
- else:
- fiscalyears = [form['fiscalyear']]
- self.cr.execute("select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id =ANY(%s)" ,(fiscalyears,))
+ 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:
- self.cr.execute("""
- Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id =ANY(%s)""",(periods,))
+ 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']
@@ -167,9 +140,6 @@ class general_ledger(rml_parse.rml_parse):
}
return self.date_borne
-
-
-
def get_children_accounts(self, account, form):
self.child_ids = self.pool.get('account.account').search(self.cr, self.uid,
@@ -184,6 +154,8 @@ class general_ledger(rml_parse.rml_parse):
if form.has_key('fiscalyear'):
ctx['fiscalyear'] = form['fiscalyear']
ctx['periods'] = form['periods']
+ #ctx['periods'] = form['periods'][0][2]
+
else:
ctx['date_from'] = form['date_from']
ctx['date_to'] = form['date_to']
@@ -224,8 +196,8 @@ class general_ledger(rml_parse.rml_parse):
else:
## We will now compute solde initiaux
for move in res:
- self.cr.execute("""SELECT sum(l.debit) AS sum_debit, sum(l.credit) AS sum_credit FROM account_move_line l \
- WHERE l.account_id = %s AND l.date < %s AND l.date > %s""",(move.id,self.borne_date['max_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()
if resultat[0] :
if resultat[0]['sum_debit'] == None:
@@ -248,56 +220,60 @@ class general_ledger(rml_parse.rml_parse):
return res
def lines(self, account, form):
- inv_types = {
- 'out_invoice': 'CI: ',
- 'in_invoice': 'SI: ',
- 'out_refund': 'OR: ',
- 'in_refund': 'SR: ',
- }
+ """ Return all the account_move_line of account with their account code counterparts """
- if form['sortbydate'] == 'sort_date':
- sorttag = 'l.date'
- else:
- sorttag = 'j.code'
+ # First compute all counterpart strings for every move_id where this account appear
sql = """
- SELECT l.id, l.date, j.code,c.code AS currency_code,l.amount_currency,l.ref, l.name , COALESCE(l.debit,0) as debit, COALESCE(l.credit,0) as credit, l.period_id
- FROM account_move_line as l
- LEFT JOIN res_currency c on (l.currency_id=c.id)
- JOIN account_journal j on (l.journal_id=j.id)
- AND account_id = %%s
- AND %s
- WHERE l.date<=%%s
- AND l.date>=%%s
- ORDER by %s""" % (self.query, sorttag)
-
- self.cr.execute(sql, (account.id, self.date_borne['max_date'], self.date_borne['min_date'],))
+ SELECT m1.move_id,
+ array_to_string(ARRAY(SELECT DISTINCT a.code FROM account_move_line m2 LEFT JOIN account_account a ON (m2.account_id=a.id) WHERE m2.move_id = m1.move_id AND m2.account_id<>%%s), ', ') AS counterpart
+ FROM (SELECT move_id FROM account_move_line l WHERE %s AND l.account_id = %%s AND l.date<=%%s AND l.date>=%%s GROUP BY move_id) m1
+ """ % self.query
+ self.cr.execute(sql, (account.id, account.id, self.date_borne['max_date'], self.date_borne['min_date']))
+ counterpart_res = self.cr.dictfetchall()
+ counterpart_accounts = {}
+ for i in counterpart_res:
+ counterpart_accounts[i['move_id']]=i['counterpart']
+ del counterpart_res
+ # Then select all account_move_line of this account
+ if form['sortbydate'] == 'sort_date':
+ sql_sort='l.date'
+ else:
+ sql_sort='j.code'
+ sql = """
+ SELECT l.id, l.date, j.code, l.amount_currency,l.ref, l.name, COALESCE(l.debit,0) AS debit, COALESCE(l.credit,0) AS credit, l.period_id, l.partner_id,
+ m.name AS move_name, m.id AS move_id,
+ c.code AS currency_code,
+ i.id AS invoice_id, i.type AS invoice_type, i.number AS invoice_number,
+ p.name AS partner_name
+ FROM account_move_line l
+ LEFT JOIN account_move m on (l.move_id=m.id)
+ LEFT JOIN res_currency c on (l.currency_id=c.id)
+ LEFT JOIN res_partner p on (l.partner_id=p.id)
+ LEFT JOIN account_invoice i on (m.id =i.move_id)
+ JOIN account_journal j on (l.journal_id=j.id)
+ WHERE %s AND l.account_id = %%s AND l.date<=%%s AND l.date>=%%s ORDER by %s
+ """ % (self.query, sql_sort)
+ self.cr.execute(sql, (account.id, self.date_borne['max_date'], self.date_borne['min_date']))
res = self.cr.dictfetchall()
- sum = 0.0
+ account_sum = 0.0
account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
+ inv_types = { 'out_invoice': 'CI', 'in_invoice': 'SI', 'out_refund': 'OR', 'in_refund': 'SR', }
+
for l in res:
- line = self.pool.get('account.move.line').browse(self.cr, self.uid, l['id'])
- l['move'] = line.move_id.name
- self.cr.execute('Select id from account_invoice where move_id =%s',(line.move_id.id,))
- tmpres = self.cr.dictfetchall()
- if len(tmpres) > 0 :
- inv = self.pool.get('account.invoice').browse(self.cr, self.uid, tmpres[0]['id'])
- l['ref'] = inv_types[inv.type] + ': '+str(inv.number)
- if line.partner_id :
- l['partner'] = line.partner_id.name
- else :
- l['partner'] = ''
- sum = l['debit'] - l ['credit']
-# c = time.strptime(l['date'],"%Y-%m-%d")
-# l['date'] = time.strftime("%d-%m-%Y",c)
- l['progress'] = sum
- l['line_corresp'] = self._calc_contrepartie(self.cr,self.uid,[l['id']])[l['id']]
+ l['move']=l['move_name']
+ if l['invoice_id']:
+ l['ref'] = '%s: %s'%(inv_types[l['invoice_type']],l['invoice_number'])
+ l['partner'] = l['partner_name'] or ''
+ account_sum = l['debit'] - l ['credit']
+ #c = time.strptime(l['date'],"%Y-%m-%d")
+ #l['date'] = time.strftime("%d-%m-%Y",c)
+ l['progress'] = account_sum
+ l['line_corresp'] = counterpart_accounts[l['move_id']]
# Modification du amount Currency
- if (l['credit'] > 0):
+ if l['credit'] > 0:
if l['amount_currency'] != None:
l['amount_currency'] = abs(l['amount_currency']) * -1
-
- #
if l['amount_currency'] != None:
self.tot_currency = self.tot_currency + l['amount_currency']
return res
@@ -306,7 +282,7 @@ class general_ledger(rml_parse.rml_parse):
self.cr.execute("SELECT sum(debit) "\
"FROM account_move_line l "\
- "WHERE l.account_id = %s AND "+self.query,(account.id,))
+ "WHERE l.account_id = %s AND %s "%(account.id, self.query))
## Add solde init to the result
#
sum_debit = self.cr.fetchone()[0] or 0.0
@@ -320,7 +296,7 @@ class general_ledger(rml_parse.rml_parse):
self.cr.execute("SELECT sum(credit) "\
"FROM account_move_line l "\
- "WHERE l.account_id = %s AND "+ self.query,(account.id,))
+ "WHERE l.account_id = %s AND %s "%(account.id,self.query))
## Add solde init to the result
#
sum_credit = self.cr.fetchone()[0] or 0.0
@@ -334,7 +310,7 @@ class general_ledger(rml_parse.rml_parse):
def _sum_solde_account(self, account, form):
self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_solde "\
"FROM account_move_line l "\
- "WHERE l.account_id = %s AND "+ self.query,(account.id,))
+ "WHERE l.account_id = %s AND %s"%(account.id,self.query))
sum_solde = self.cr.fetchone()[0] or 0.0
if form.get('soldeinit', False):
sum_solde += account.init_debit - account.init_credit
@@ -346,7 +322,7 @@ class general_ledger(rml_parse.rml_parse):
return 0.0
self.cr.execute("SELECT sum(debit) "\
"FROM account_move_line l "\
- "WHERE l.account_id =ANY(%s) AND "+ self.query,(self.child_ids,))
+ "WHERE l.account_id in ("+','.join(map(str, self.child_ids))+") AND "+self.query)
sum_debit = self.cr.fetchone()[0] or 0.0
return sum_debit
@@ -355,7 +331,7 @@ class general_ledger(rml_parse.rml_parse):
return 0.0
self.cr.execute("SELECT sum(credit) "\
"FROM account_move_line l "\
- "WHERE l.account_id =ANY(%s) AND "+ self.query,(self.child_ids,))
+ "WHERE l.account_id in ("+','.join(map(str, self.child_ids))+") AND "+self.query)
## Add solde init to the result
#
sum_credit = self.cr.fetchone()[0] or 0.0
@@ -366,14 +342,14 @@ class general_ledger(rml_parse.rml_parse):
return 0.0
self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_solde "\
"FROM account_move_line l "\
- "WHERE l.account_id =ANY(%s) AND "+ self.query,(self.child_ids,))
+ "WHERE l.account_id in ("+','.join(map(str, self.child_ids))+") AND "+self.query)
sum_solde = self.cr.fetchone()[0] or 0.0
return sum_solde
def _set_get_account_currency_code(self, account_id):
self.cr.execute("SELECT c.code as code "\
"FROM res_currency c,account_account as ac "\
- "WHERE ac.id = %s AND ac.currency_id = c.id",(account_id,))
+ "WHERE ac.id = %s AND ac.currency_id = c.id"%(account_id))
result = self.cr.fetchone()
if result:
self.account_currency = result[0]
@@ -392,6 +368,7 @@ class general_ledger(rml_parse.rml_parse):
currency_total = self.tot_currency = 0.0
return currency_total
-
report_sxw.report_sxw('report.account.general.ledger', 'account.account', 'addons/account/report/general_ledger.rml', parser=general_ledger, header=False)
+report_sxw.report_sxw('report.account.general.ledger_landscape', 'account.account', 'addons/account/report/general_ledger_landscape.rml', parser=general_ledger, header=False)
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml
index 75cb086b343..c69c981e35c 100644
--- a/addons/account/report/general_ledger.rml
+++ b/addons/account/report/general_ledger.rml
@@ -105,7 +105,7 @@
[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]
- [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+ [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
diff --git a/addons/account/report/general_ledger_landscape.py b/addons/account/report/general_ledger_landscape.py
deleted file mode 100644
index 472f0675519..00000000000
--- a/addons/account/report/general_ledger_landscape.py
+++ /dev/null
@@ -1,396 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2005-2006 CamptoCamp
-#
-# 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
-import xml
-import rml_parse
-import pooler
-
-class general_ledger_landscape(rml_parse.rml_parse):
- _name = 'report.account.general.ledger_landscape'
-
-
- def set_context(self, objects, data, ids, report_type = None):
- ##
- self.borne_date = self.get_min_date(data['form'])
- ##
- new_ids = []
- if (data['model'] == 'account.account'):
- new_ids = 'active_ids' in data['form']['context'] and data['form']['context']['active_ids'] or []
- else:
- new_ids.append(data['form']['Account_list'])
- objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
- super(general_ledger_landscape, self).set_context(objects, data, new_ids,report_type)
-
- def __init__(self, cr, uid, name, context):
- super(general_ledger_landscape, self).__init__(cr, uid, name, context=context)
- self.date_borne = {}
- self.query = ""
- self.child_ids = ""
- self.tot_currency = 0.0
- self.period_sql = ""
- self.sold_accounts = {}
- self.localcontext.update( {
- 'time': time,
- 'lines': self.lines,
- 'sum_debit_account': self._sum_debit_account,
- 'sum_credit_account': self._sum_credit_account,
- 'sum_solde_account': self._sum_solde_account,
- 'sum_debit': self._sum_debit,
- 'sum_credit': self._sum_credit,
- 'sum_solde': self._sum_solde,
- 'get_children_accounts': self.get_children_accounts,
- 'sum_currency_amount_account': self._sum_currency_amount_account
- })
- self.context = context
- def _calc_contrepartie(self,cr,uid,ids, context={}):
- result = {}
- #for id in ids:
- # result.setdefault(id, False)
-
- for account_line in self.pool.get('account.move.line').browse(cr, uid, ids, context):
- # For avoid long text in the field we will limit it to 5 lines
- #
- #
- #
- result[account_line.id] = ' '
- num_id_move = account_line.move_id.id
- num_id_line = account_line.id
- account_id = account_line.account_id.id
- # search the basic account
- # We have the account ID we will search all account move line from now until this time
- # We are in the case of we are on the top of the account move Line
- cr.execute('SELECT distinct(ac.code) as code_rest,ac.name as name_rest from account_account AS ac, account_move_line mv\
- where ac.id = mv.account_id and mv.move_id = %s and mv.account_id <> %s' , (num_id_move,account_id,))
- res_mv = cr.dictfetchall()
- # we need a result more than 2 line to make the test so we will made the the on 1 because we have exclude the current line
- if (len(res_mv) >=1):
- concat = ''
- rup_id = 0
- for move_rest in res_mv:
- concat = concat + move_rest['code_rest'] + '|'
- result[account_line.id] = concat
- if rup_id >5:
- # we need to stop the computing and to escape but before we will add "..."
- result[account_line.id] = concat + '...'
- break
- rup_id+=1
- return result
-
- def get_min_date(self,form):
-
- ## Get max born from account_fiscal year
- #
- 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]['start_date']
- borne_max = res[0]['stop_date']
- if form['state'] == 'byperiod':
- ## This function will return the most aged date
- periods = form['periods']
- if not periods:
- self.cr.execute("""
- Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = %s""" ,(form['fiscalyear'],))
- else:
- self.cr.execute("""
- Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id =ANY(%s)""",(periods,))
-
- res = self.cr.dictfetchall()
- 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']
- if not periods:
- if form['fiscalyear'] == False:
- fiscalyears = self.pool.get('account.fiscalyear').search(self.cr, self.uid, [('state', '=', 'draft')])
- else:
- fiscalyears = [form['fiscalyear']]
- self.cr.execute("select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id =ANY(%s)" ,(fiscalyears,))
- else:
- self.cr.execute("""
- Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id =ANY(%s)""",(periods,))
- 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=',child_account.id)],
- context=ctx)) <> 0 :
- res.append(child_account)
- ##
- if not len(res):
-
- return [account]
- else:
- ## We will now compute solde initiaux
- for move in res:
- self.cr.execute("""SELECT sum(l.debit) AS sum_debit, sum(l.credit) AS sum_credit FROM account_move_line l \
- WHERE l.account_id = %s AND l.date < %s AND l.date > %s""",(move.id,self.borne_date['max_date'],self.borne_date['min_date']))
- 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
- else:
- sum_credit = resultat[0]['sum_credit']
-
- move.init_credit = sum_credit
- move.init_debit = sum_debit
-
- else:
- move.init_credit = 0
- move.init_debit = 0
-
-
- return res
-
- def lines(self, account, form):
- inv_types = {
- 'out_invoice': 'CI: ',
- 'in_invoice': 'SI: ',
- 'out_refund': 'OR: ',
- 'in_refund': 'SR: ',
- }
-
- if form['sortbydate'] == 'sort_date':
- sorttag = 'l.date'
- else:
- sorttag = 'j.code'
- sql = """
- SELECT l.id, l.date, j.code,c.code AS currency_code,l.amount_currency,l.ref, l.name , COALESCE(l.debit,0) as debit, COALESCE(l.credit,0) as credit, l.period_id
- FROM account_move_line as l
- LEFT JOIN res_currency c on (l.currency_id=c.id)
- JOIN account_journal j on (l.journal_id=j.id)
- AND account_id = %%s
- AND %s
- WHERE l.date<=%%s
- AND l.date>=%%s
- ORDER by %s""" % (self.query, sorttag)
-
- self.cr.execute(sql, (account.id, self.date_borne['max_date'], self.date_borne['min_date'],))
-
- 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:
- line = self.pool.get('account.move.line').browse(self.cr, self.uid, l['id'])
- l['move'] = line.move_id.name
- self.cr.execute('Select id from account_invoice where move_id =%s',(line.move_id.id,))
- tmpres = self.cr.dictfetchall()
- if len(tmpres) > 0 :
- inv = self.pool.get('account.invoice').browse(self.cr, self.uid, tmpres[0]['id'])
- l['ref'] = inv_types[inv.type] + ': '+str(inv.number)
- if line.partner_id :
- l['partner'] = line.partner_id.name
- else :
- l['partner'] = ''
- sum = l['debit'] - l ['credit']
-# c = time.strptime(l['date'],"%Y-%m-%d")
-# l['date'] = time.strftime("%d-%m-%Y",c)
- l['progress'] = sum
- l['line_corresp'] = self._calc_contrepartie(self.cr,self.uid,[l['id']])[l['id']]
- # Modification du amount Currency
- if (l['credit'] > 0):
- if l['amount_currency'] != None:
- l['amount_currency'] = abs(l['amount_currency']) * -1
-
- #
- if l['amount_currency'] != None:
- self.tot_currency = self.tot_currency + l['amount_currency']
- return res
-
- def _sum_debit_account(self, account, form):
-
- self.cr.execute("SELECT sum(debit) "\
- "FROM account_move_line l "\
- "WHERE l.account_id = %s AND "+self.query,(account.id,))
- ## Add solde init to the result
- #
- sum_debit = self.cr.fetchone()[0] or 0.0
- if form['soldeinit']:
- sum_debit += account.init_debit
- #
- ##
- return sum_debit
-
- def _sum_credit_account(self, account, form):
-
- self.cr.execute("SELECT sum(credit) "\
- "FROM account_move_line l "\
- "WHERE l.account_id = %s AND "+self.query,(account.id,))
- ## Add solde init to the result
- #
- sum_credit = self.cr.fetchone()[0] or 0.0
- if form['soldeinit']:
- sum_credit += account.init_credit
- #
- ##
-
- return sum_credit
-
- def _sum_solde_account(self, account, form):
- self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_solde "\
- "FROM account_move_line l "\
- "WHERE l.account_id = %s AND "+self.query,(account.id,))
- sum_solde = self.cr.fetchone()[0] or 0.0
- if form.get('soldeinit',False):
- sum_solde += account.init_debit - account.init_credit
-
- return sum_solde
-
- def _sum_debit(self, form):
- if not self.ids:
- return 0.0
- self.cr.execute("SELECT sum(debit) "\
- "FROM account_move_line l "\
- "WHERE l.account_id =ANY(%s) AND "+self.query,(self.child_ids,))
- sum_debit = self.cr.fetchone()[0] or 0.0
- return sum_debit
-
- def _sum_credit(self, form):
- if not self.ids:
- return 0.0
- self.cr.execute("SELECT sum(credit) "\
- "FROM account_move_line l "\
- "WHERE l.account_id =ANY(%s) AND "+self.query,(self.child_ids,))
- ## Add solde init to the result
- #
- sum_credit = self.cr.fetchone()[0] or 0.0
- return sum_credit
-
- def _sum_solde(self, form):
- if not self.ids:
- return 0.0
- self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_solde "\
- "FROM account_move_line l "\
- "WHERE l.account_id =ANY(%s) AND "+self.query,(self.child_ids,))
- sum_solde = self.cr.fetchone()[0] or 0.0
- return sum_solde
-
- def _set_get_account_currency_code(self, account_id):
- self.cr.execute("SELECT c.code as code "\
- "FROM res_currency c,account_account as ac "\
- "WHERE ac.id = %s AND ac.currency_id = c.id",(account_id,))
- result = self.cr.fetchone()
- if result:
- self.account_currency = result[0]
- else:
- self.account_currency = False
-
- def _sum_currency_amount_account(self, account, form):
- self._set_get_account_currency_code(account.id)
- self.cr.execute("SELECT sum(aml.amount_currency) FROM account_move_line as aml,res_currency as rc WHERE aml.currency_id = rc.id AND aml.account_id= %s ", (account.id,))
- total = self.cr.fetchone()
-
- if self.account_currency:
- return_field = str(total[0]) + self.account_currency
- return return_field
- else:
- currency_total = self.tot_currency = 0.0
- return currency_total
-
-report_sxw.report_sxw('report.account.general.ledger_landscape', 'account.account', 'addons/account/report/general_ledger_landscape.rml', parser=general_ledger_landscape, header=False)
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml
index 9e937a72baf..a707a47d0bd 100644
--- a/addons/account/report/general_ledger_landscape.rml
+++ b/addons/account/report/general_ledger_landscape.rml
@@ -104,7 +104,7 @@
[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]
- [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+ [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
- [[ formatLang(abs(sum_dr())) ]]
+ [[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]]
@@ -256,7 +256,7 @@
- [[ formatLang(abs(a.balance)) ]]
+ [[ a.balance and formatLang(abs(a.balance)) or 0.0 ]]
@@ -269,7 +269,7 @@
[[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]]
- [[ final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) or '' ]]
+ [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]]
- [[ formatLang(abs(a['balance'])) ]]
+ [[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]]
@@ -227,7 +227,7 @@
- [[ formatLang(abs(a['balance1'])) ]]
+ [[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]]
@@ -240,7 +240,7 @@
[[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or '' ]]
- [[ final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(abs(final_result()['balance'])) or '' ]]
+ [[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]]
@@ -249,7 +249,7 @@
[[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or '' ]]
- [[ final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) or '' ]]
+ [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]]