pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]: With main

Browse Source 
bzr revid: aja@tinyerp.com-20130312131722-ket6ujesw7q178c0
This commit is contained in:
ajay javiya (OpenERP)
2013-03-12 18:47:22 +05:30
parent 2264cf3f21 3aa39206f9
commit e2a47396fa
5381 changed files with 219237 additions and 79848 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account.py
+8
View File
@@ -1850,6 +1850,14 @@ class account_tax(osv.osv):
return result in the context
Ex: result=round(price_unit*0.21,4)
"""
def copy_data(self, cr, uid, id, default=None, context=None):
if default is None:
default = {}
name = self.read(cr, uid, id, ['name'], context=context)['name']
default = default.copy()
default.update({'name': name + _(' (Copy)')})
return super(account_tax, self).copy_data(cr, uid, id, default=default, context=context)
def get_precision_tax():
def change_digit_tax(cr):
addons/account/account_invoice.py
+23 -17
View File
@@ -22,6 +22,7 @@
import time
from lxml import etree
import openerp.addons.decimal_precision as dp
import openerp.exceptions
from openerp import netsvc
from openerp import pooler
@@ -304,16 +305,7 @@ class account_invoice(osv.osv):
('number_uniq', 'unique(number, company_id, journal_id, type)', 'Invoice Number must be unique per Company!'),
]
def _find_partner(self, inv):
'''
Find the partner for which the accounting entries will be created
'''
#if the chosen partner is not a company and has a parent company, use the parent for the journal entries
#because you want to invoice 'Agrolait, accounting department' but the journal items are for 'Agrolait'
part = inv.partner_id
if part.parent_id and not part.is_company:
part = part.parent_id
return part
def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
@@ -419,7 +411,7 @@ class account_invoice(osv.osv):
try:
compose_form_id = ir_model_data.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')[1]
except ValueError:
compose_form_id = False
compose_form_id = False
ctx = dict(context)
ctx.update({
'default_model': 'account.invoice',
@@ -451,11 +443,15 @@ class account_invoice(osv.osv):
context = {}
invoices = self.read(cr, uid, ids, ['state','internal_number'], context=context)
unlink_ids = []
for t in invoices:
if t['state'] in ('draft', 'cancel') and t['internal_number']== False:
unlink_ids.append(t['id'])
if t['state'] not in ('draft', 'cancel'):
raise openerp.exceptions.Warning(_('You cannot delete an invoice which is not draft or cancelled. You should refund it instead.'))
elif t['internal_number']:
raise openerp.exceptions.Warning(_('You cannot delete an invoice after it has been validated (and received a number). You can set it back to "Draft" state and modify its content, then re-confirm it.'))
else:
raise osv.except_osv(_('Invalid Action!'), _('You can not delete an invoice which is not cancelled. You should refund it instead.'))
unlink_ids.append(t['id'])
osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
return True
@@ -540,11 +536,11 @@ class account_invoice(osv.osv):
return result
def onchange_payment_term_date_invoice(self, cr, uid, ids, payment_term_id, date_invoice):
res = {}
res = {}
if not date_invoice:
date_invoice = time.strftime('%Y-%m-%d')
if not payment_term_id:
return {'value':{'date_due': date_invoice}} #To make sure the invoice has a due date when no payment term
return {'value':{'date_due': date_invoice}} #To make sure the invoice has a due date when no payment term
pterm_list = self.pool.get('account.payment.term').compute(cr, uid, payment_term_id, value=1, date_ref=date_invoice)
if pterm_list:
pterm_list = [line[0] for line in pterm_list]
@@ -975,7 +971,7 @@ class account_invoice(osv.osv):
date = inv.date_invoice or time.strftime('%Y-%m-%d')
part = self._find_partner(inv)
part = self.pool.get("res.partner")._find_accounting_partner(inv.partner_id)
line = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, part.id, date, context=ctx)),iml)
@@ -1747,6 +1743,16 @@ class res_partner(osv.osv):
'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
}
def _find_accounting_partner(self, part):
'''
Find the partner for which the accounting entries will be created
'''
#if the chosen partner is not a company and has a parent company, use the parent for the journal entries
#because you want to invoice 'Agrolait, accounting department' but the journal items are for 'Agrolait'
if part.parent_id and not part.is_company:
part = part.parent_id
return part
def copy(self, cr, uid, id, default=None, context=None):
default = default or {}
default.update({'invoice_ids' : []})
addons/account/account_invoice_view.xml
+9 -9
View File
@@ -145,8 +145,8 @@
<header>
<button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_highlight" groups="account.group_account_invoice"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid' groups="account.group_account_invoice"/>
<button name="invoice_cancel" states="draft,proforma2" string="Cancel" groups="account.group_account_invoice"/>
<button name="invoice_cancel" states="sale,open" string="Cancel" groups="base.group_no_one"/>
<button name="invoice_cancel" states="draft,proforma2" string="Cancel Invoice" groups="account.group_account_invoice"/>
<button name="invoice_cancel" states="sale,open" string="Cancel Invoice" groups="base.group_no_one"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" groups="account.group_account_invoice"/>
<button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
<field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
@@ -300,7 +300,7 @@
<button name="invoice_open" states="proforma2" string="Validate" groups="base.group_user"/>
<button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='open,proforma2,paid' groups="base.group_user"/>
<button name="invoice_cancel" states="draft,proforma2,open" string="Cancel" groups="base.group_no_one"/>
<button name="invoice_cancel" states="draft,proforma2,open" string="Cancel Invoice" groups="base.group_no_one"/>
<button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" groups="base.group_user"/>
<button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
<!--button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/-->
@@ -437,7 +437,7 @@
</sheet>
<div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
<field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
<field name="message_ids" widget="mail_thread"/>
</div>
</form>
</field>
@@ -448,11 +448,11 @@
<field name="model">account.invoice</field>
<field name="arch" type="xml">
<search string="Search Invoice">
<field name="number" string="Invoice" filter_domain="['|','|', ('number','ilike',self), ('origin','ilike',self), ('supplier_invoice_number', 'ilike', self)]"/>
<filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
<filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices" groups="account.group_proforma_invoices"/>
<filter name="invoices" icon="terp-dolar" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
<filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
<field name="number" string="Invoice" filter_domain="['|','|','|', ('number','ilike',self), ('origin','ilike',self), ('supplier_invoice_number', 'ilike', self), ('partner_id', 'ilike', self)]"/>
<filter name="draft" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
<filter name="proforma" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices" groups="account.group_proforma_invoices"/>
<filter name="invoices" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
<filter name="unpaid" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
<separator/>
<filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/>
<field name="partner_id"/>
addons/account/account_move_line.py
+1 -1
View File
@@ -780,7 +780,7 @@ class account_move_line(osv.osv):
else:
currency_id = line.company_id.currency_id
if line.reconcile_id:
raise osv.except_osv(_('Warning!'), _('Already reconciled.'))
raise osv.except_osv(_('Warning'), _("Journal Item '%s' (id: %s), Move '%s' is already reconciled!") % (line.name, line.id, line.move_id.name))
if line.reconcile_partial_id:
for line2 in line.reconcile_partial_id.line_partial_ids:
if not line2.reconcile_id:
addons/account/account_view.xml
+16 -14
View File
@@ -161,7 +161,7 @@
</p>
</field>
</record>
<menuitem id="menu_action_account_period" action="action_account_period" parent="account.next_id_23" groups="base.group_no_one"/>
<menuitem id="menu_action_account_period" action="action_account_period" parent="account.next_id_23"/>
<!-- Accounts -->
<record id="view_account_form" model="ir.ui.view">
@@ -435,15 +435,15 @@
<group string="Accounts">
<field name="profit_account_id" domain="[('type','!=','view')]"/>
<field name="loss_account_id" domain="[('type','!=','view')]"/>
<field name="internal_account_id"/>
<field name="internal_account_id" domain="[('type','!=','view')]"/>
</group>
<group string="Miscellaneous">
<field name="with_last_closing_balance"/>
<field name="cash_control"/>
<field name="cash_control" attrs="{'invisible':[('type','not in', ('cash',))]}"/>
</group>
</group>
<separator string="Available Coins" colspan="4" attrs="{'invisible' : [('cash_control', '=', False)] }"/>
<field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4" attrs="{'invisible' : [('cash_control', '=', False)]}">
<separator string="Available Coins" colspan="4" attrs="{'invisible' : ['|',('cash_control', '=', False),('type','not in', ('cash',))] }"/>
<field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4" attrs="{'invisible' : ['|',('cash_control', '=', False),('type','not in', ('cash',))]}">
<tree string="CashBox Lines" editable="bottom">
<field name="pieces" />
</tree>
@@ -552,7 +552,7 @@
<header>
<button name="button_confirm_bank" states="draft" string="Confirm" type="object" class="oe_highlight"/>
<button name="button_dummy" states="draft" string="Compute" type="object" class="oe_highlight"/>
<button name="button_cancel" states="confirm" string="Cancel" type="object"/>
<button name="button_cancel" states="confirm" string="Cancel Statement" type="object"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
</header>
<sheet>
@@ -922,7 +922,7 @@
</group>
<group string="Invoices">
<field name="account_collected_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="account_analytic_collected_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id), ('parent_id', '&lt;&gt;', False)]" groups="analytic.group_analytic_accounting"/>
<field name="account_analytic_collected_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id)]" groups="analytic.group_analytic_accounting"/>
<field name="base_code_id"/>
<field name="base_sign"/>
@@ -932,7 +932,7 @@
</group>
<group string="Refunds">
<field name="account_paid_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="account_analytic_paid_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id), ('parent_id', '&lt;&gt;', False)]" groups="analytic.group_analytic_accounting"/>
<field name="account_analytic_paid_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id)]" groups="analytic.group_analytic_accounting"/>
<field name="ref_base_code_id"/>
<field name="ref_base_sign"/>
@@ -1039,7 +1039,7 @@
<field name="blocked"/>
</group>
<group groups="analytic.group_analytic_accounting" string="Analytic">
<field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
<field name="analytic_account_id" domain="[('type','in',('normal','contract'))]"/>
</group>
</group>
<field name="narration" colspan="4" nolabel="1" placeholder="Add an internal note..."/>
@@ -1084,7 +1084,7 @@
<field name="blocked"/>
<newline/>
<field name="account_tax_id" domain="[('parent_id','=',False)]"/>
<field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
<separator colspan="4" string="Status"/>
<newline/>
<field name="reconcile_id"/>
@@ -1206,6 +1206,8 @@
<field name="name"/>
<field name="partner_id"/>
<field name="account_id"/>
<field name="period_id" invisible="1"/>
<field name="journal_id" invisible="1"/>
<field name="reconcile_partial_id"/>
<field name="state" invisible="1"/>
<field name="debit" sum="Total debit"/>
@@ -1256,7 +1258,7 @@
<form string="Account Entry" version="7.0">
<header>
<button name="button_validate" states="draft" string="Post" type="object" class="oe_highlight" groups="account.group_account_invoice"/>
<button name="button_cancel" states="posted" string="Cancel" type="object" groups="account.group_account_invoice"/>
<button name="button_cancel" states="posted" string="Cancel Entry" type="object" groups="account.group_account_invoice"/>
<field name="state" widget="statusbar"/>
</header>
<sheet string="Journal Entries" >
@@ -1336,7 +1338,7 @@
</group>
<group groups="analytic.group_analytic_accounting" string="Analytic">
<field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
<field name="analytic_account_id"/>
</group>
</group>
<separator string="Internal Note"/>
@@ -1355,7 +1357,7 @@
<field name="date_maturity"/>
<field name="debit" sum="Total Debit"/>
<field name="credit" sum="Total Credit"/>
<field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
<field name="amount_currency"/>
<field name="currency_id" groups="base.group_multi_currency"/>
<field name="tax_code_id"/>
@@ -2258,7 +2260,7 @@
<header>
<button name="button_confirm_cash" states="open" string="Close CashBox" type="object" class="oe_highlight"/>
<button name="button_open" states="draft" string="Open CashBox" type="object" class="oe_highlight"/>
<button name="button_cancel" states="confirm,open" string="Cancel" type="object"/>
<button name="button_cancel" states="confirm,open" string="Cancel CashBox" type="object"/>
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
</header>
<sheet string="Statement">
addons/account/i18n/account.pot
+241 -169
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/ar.po
+278 -184
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/bg.po
+261 -180
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/br.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/bs.po
+257 -179
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/ca.po
+276 -186
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/cs.po
+263 -182
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/da.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/de.po
+306 -212
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/el.po
+257 -179
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/en_GB.po
+304 -210
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/en_US.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/es.po
+302 -208
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/es_AR.po
+257 -179
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/es_CL.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/es_CR.po
+263 -182
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/es_DO.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/es_EC.po
+263 -182
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/es_MX.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/es_PY.po
+263 -182
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/es_UY.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/es_VE.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/et.po
+254 -179
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/eu.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/fa.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/fa_AF.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/fi.po
+262 -181
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/fr.po
+315 -196
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/fr_BE.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/gl.po
+260 -182
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/gu.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/he.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/hi.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/hr.po
+275 -185
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/hu.po
+268 -187
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/id.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/it.po
+305 -211
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/ja.po
+263 -182
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/kab.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/kk.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/ko.po
+519 -440
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/lo.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/lt.po
+257 -179
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/lv.po
+349 -262
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/mk.po
+1009 -580
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/mn.po
+309 -209
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/nb.po
+260 -182
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/nl.po
+325 -225
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/nl_BE.po
+303 -209
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/oc.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/pl.po
+295 -201
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/pt.po
+263 -182
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/pt_BR.po
+305 -211
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/ro.po
+312 -212
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/ru.po
+265 -184
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/si.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/sk.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/sl.po
+289 -194
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/sq.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/sr.po
+257 -179
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/sr@latin.po
+257 -179
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/sv.po
+263 -182
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/ta.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/te.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/th.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/tlh.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/tr.po
+1003 -888
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/ug.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/uk.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/ur.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/vi.po
+263 -182
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/zh_CN.po
+273 -189
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/zh_HK.po
+252 -177
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/zh_TW.po
+267 -183
View File
File diff suppressed because it is too large Load Diff
addons/account/partner_view.xml
+1
View File
@@ -95,6 +95,7 @@
</group>
<field name="bank_ids" context="{'default_partner_id': active_id, 'form_view_ref': 'base.view_partner_bank_form'}">
<tree string="Bank Details">
<field name="state" invisible="1"/>
<field name="sequence" invisible="1"/>
<field name="acc_number"/>
<field name="bank_name"/>
addons/account/project/project_view.xml
+3 -2
View File
@@ -11,8 +11,8 @@
<field name="complete_name"/>
<field name="partner_id"/>
<field name="code"/>
<field name="date"/>
<field name="date_start"/>
<field name="date"/>
<field name="user_id" invisible="1"/>
<field name="manager_id"/>
<field name="parent_id" invisible="1"/>
@@ -131,6 +131,7 @@
<field name="name"/>
<field name="account_id"/>
<field name="journal_id"/>
<field name="user_id"/>
</group>
<group>
<field name="date"/>
@@ -169,6 +170,7 @@
<field name="date"/>
<field name="ref" invisible="context.get('to_invoice', False)"/>
<field name="name"/>
<field name="user_id"/>
<field name="journal_id" invisible="context.get('to_invoice', False)"/>
<field name="amount" sum="Total" invisible="context.get('to_invoice', False)"/>
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)" invisible="not context.get('to_invoice', False)"/>
@@ -176,7 +178,6 @@
<field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" invisible="not context.get('to_invoice', False)"/>
<field domain="[('type','=','normal')]" name="account_id"/>
<field name="general_account_id" invisible="context.get('to_invoice', False)"/>
<field name="user_id" invisible="1" />
<field name="company_id" groups="base.group_multi_company"/>
</tree>
</field>
addons/account/report/account_financial_report.py
+2 -2
View File
@@ -65,7 +65,7 @@ class report_account_common(report_sxw.rml_parse, common_report_header):
vals['debit'] = report.debit
vals['credit'] = report.credit
if data['form']['enable_filter']:
vals['balance_cmp'] = self.pool.get('account.financial.report').browse(self.cr, self.uid, report.id, context=data['form']['comparison_context']).balance
vals['balance_cmp'] = self.pool.get('account.financial.report').browse(self.cr, self.uid, report.id, context=data['form']['comparison_context']).balance * report.sign or 0.0
lines.append(vals)
account_ids = []
if report.display_detail == 'no_detail':
@@ -97,7 +97,7 @@ class report_account_common(report_sxw.rml_parse, common_report_header):
if not currency_obj.is_zero(self.cr, self.uid, account.company_id.currency_id, vals['balance']):
flag = True
if data['form']['enable_filter']:
vals['balance_cmp'] = account_obj.browse(self.cr, self.uid, account.id, context=data['form']['comparison_context']).balance
vals['balance_cmp'] = account_obj.browse(self.cr, self.uid, account.id, context=data['form']['comparison_context']).balance * report.sign or 0.0
if not currency_obj.is_zero(self.cr, self.uid, account.company_id.currency_id, vals['balance_cmp']):
flag = True
if flag:
addons/account_accountant/i18n/account_accountant.pot
+3 -3
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Project-Id-Version: OpenERP Server 7.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-12-21 17:04+0000\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-03-07 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
addons/account_accountant/i18n/ar.po
+3 -3
View File
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Arabic <ar@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-01-18 06:31+0000\n"
"X-Generator: Launchpad (build 16430)\n"
"X-Launchpad-Export-Date: 2013-03-08 05:30+0000\n"
"X-Generator: Launchpad (build 16523)\n"
#. module: account_accountant
#: model:ir.actions.client,name:account_accountant.action_client_account_menu
addons/account_accountant/i18n/az.po
+3 -3
View File
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Azerbaijani <az@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-01-18 06:31+0000\n"
"X-Generator: Launchpad (build 16430)\n"
"X-Launchpad-Export-Date: 2013-03-08 05:30+0000\n"
"X-Generator: Launchpad (build 16523)\n"
#. module: account_accountant
#: model:ir.actions.client,name:account_accountant.action_client_account_menu
addons/account_accountant/i18n/bg.po
+3 -3
View File
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Bulgarian <bg@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-01-18 06:31+0000\n"
"X-Generator: Launchpad (build 16430)\n"
"X-Launchpad-Export-Date: 2013-03-08 05:30+0000\n"
"X-Generator: Launchpad (build 16523)\n"
#. module: account_accountant
#: model:ir.actions.client,name:account_accountant.action_client_account_menu
addons/account_accountant/i18n/bn.po
+3 -3
View File
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Bengali <bn@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-01-18 06:31+0000\n"
"X-Generator: Launchpad (build 16430)\n"
"X-Launchpad-Export-Date: 2013-03-08 05:30+0000\n"
"X-Generator: Launchpad (build 16523)\n"
#. module: account_accountant
#: model:ir.actions.client,name:account_accountant.action_client_account_menu
addons/account_accountant/i18n/bs.po
+3 -3
View File
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Bosnian <bs@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-01-18 06:31+0000\n"
"X-Generator: Launchpad (build 16430)\n"
"X-Launchpad-Export-Date: 2013-03-08 05:30+0000\n"
"X-Generator: Launchpad (build 16523)\n"
#. module: account_accountant
#: model:ir.actions.client,name:account_accountant.action_client_account_menu
addons/account_accountant/i18n/ca.po
+3 -3
View File
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Catalan <ca@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-01-18 06:31+0000\n"
"X-Generator: Launchpad (build 16430)\n"
"X-Launchpad-Export-Date: 2013-03-08 05:30+0000\n"
"X-Generator: Launchpad (build 16523)\n"
#. module: account_accountant
#: model:ir.actions.client,name:account_accountant.action_client_account_menu
addons/account_accountant/i18n/cs.po
+3 -3
View File
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2012-12-30 10:18+0000\n"
"Last-Translator: Jan Grmela <Unknown>\n"
"Language-Team: Czech <cs@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-01-18 06:31+0000\n"
"X-Generator: Launchpad (build 16430)\n"
"X-Launchpad-Export-Date: 2013-03-08 05:30+0000\n"
"X-Generator: Launchpad (build 16523)\n"
#. module: account_accountant
#: model:ir.actions.client,name:account_accountant.action_client_account_menu
addons/account_accountant/i18n/da.po
+3 -3
View File
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Danish <da@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-01-18 06:31+0000\n"
"X-Generator: Launchpad (build 16430)\n"
"X-Launchpad-Export-Date: 2013-03-08 05:30+0000\n"
"X-Generator: Launchpad (build 16523)\n"
#. module: account_accountant
#: model:ir.actions.client,name:account_accountant.action_client_account_menu
addons/account_accountant/i18n/de.po
+3 -3
View File
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-01-18 06:31+0000\n"
"X-Generator: Launchpad (build 16430)\n"
"X-Launchpad-Export-Date: 2013-03-08 05:30+0000\n"
"X-Generator: Launchpad (build 16523)\n"
#. module: account_accountant
#: model:ir.actions.client,name:account_accountant.action_client_account_menu
addons/account_accountant/i18n/el.po
+3 -3
View File
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Greek <el@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-01-18 06:31+0000\n"
"X-Generator: Launchpad (build 16430)\n"
"X-Launchpad-Export-Date: 2013-03-08 05:30+0000\n"
"X-Generator: Launchpad (build 16523)\n"
#. module: account_accountant
#: model:ir.actions.client,name:account_accountant.action_client_account_menu
addons/account_accountant/i18n/en_GB.po
+3 -3
View File
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-02-06 14:17+0000\n"
"Last-Translator: mrx5682 <Unknown>\n"
"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-02-07 05:41+0000\n"
"X-Generator: Launchpad (build 16477)\n"
"X-Launchpad-Export-Date: 2013-03-08 05:31+0000\n"
"X-Generator: Launchpad (build 16523)\n"
#. module: account_accountant
#: model:ir.actions.client,name:account_accountant.action_client_account_menu
addons/account_accountant/i18n/es.po
+3 -3
View File
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Spanish <es@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-01-18 06:31+0000\n"
"X-Generator: Launchpad (build 16430)\n"
"X-Launchpad-Export-Date: 2013-03-08 05:31+0000\n"
"X-Generator: Launchpad (build 16523)\n"
#. module: account_accountant
#: model:ir.actions.client,name:account_accountant.action_client_account_menu
addons/account_accountant/i18n/es_CO.po
+23
View File
@@ -0,0 +1,23 @@
# Spanish (Colombia) translation for openobject-addons
# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-03-11 19:01+0000\n"
"Last-Translator: Juan Erazo <juanc.erazo@gmail.com>\n"
"Language-Team: Spanish (Colombia) <es_CO@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-03-12 05:18+0000\n"
"X-Generator: Launchpad (build 16524)\n"
#. module: account_accountant
#: model:ir.actions.client,name:account_accountant.action_client_account_menu
msgid "Open Accounting Menu"
msgstr "Abrir Menú de Contabilidad"
addons/account_accountant/i18n/es_CR.po
+3 -3
View File
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Spanish (Costa Rica) <es_CR@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-01-18 06:31+0000\n"
"X-Generator: Launchpad (build 16430)\n"
"X-Launchpad-Export-Date: 2013-03-08 05:31+0000\n"
"X-Generator: Launchpad (build 16523)\n"
#. module: account_accountant
#: model:ir.actions.client,name:account_accountant.action_client_account_menu
addons/account_accountant/i18n/es_DO.po
+3 -3
View File
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Spanish (Dominican Republic) <es_DO@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-01-18 06:31+0000\n"
"X-Generator: Launchpad (build 16430)\n"
"X-Launchpad-Export-Date: 2013-03-08 05:31+0000\n"
"X-Generator: Launchpad (build 16523)\n"
#. module: account_accountant
#: model:ir.actions.client,name:account_accountant.action_client_account_menu
addons/account_accountant/i18n/es_EC.po
+3 -3
View File
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-01-18 06:31+0000\n"
"X-Generator: Launchpad (build 16430)\n"
"X-Launchpad-Export-Date: 2013-03-08 05:31+0000\n"
"X-Generator: Launchpad (build 16523)\n"
#. module: account_accountant
#: model:ir.actions.client,name:account_accountant.action_client_account_menu
addons/account_accountant/i18n/es_MX.po
+3 -3
View File
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-01-18 06:31+0000\n"
"X-Generator: Launchpad (build 16430)\n"
"X-Launchpad-Export-Date: 2013-03-08 05:31+0000\n"
"X-Generator: Launchpad (build 16523)\n"
#. module: account_accountant
#: model:ir.actions.client,name:account_accountant.action_client_account_menu

Some files were not shown because too many files have changed in this diff Show More