[MERGE] sync with trunk (state -> stage removed some test)
bzr revid: mat@openerp.com-20130911110755-zf3ytf9m27im6x9k
This commit is contained in:
commit
c48504fdba
|
@ -1 +1,2 @@
|
||||||
.*
|
.*
|
||||||
|
**/node_modules
|
||||||
|
|
|
@ -137,16 +137,27 @@ class account_account_type(osv.osv):
|
||||||
_name = "account.account.type"
|
_name = "account.account.type"
|
||||||
_description = "Account Type"
|
_description = "Account Type"
|
||||||
|
|
||||||
def _get_current_report_type(self, cr, uid, ids, name, arg, context=None):
|
def _get_financial_report_ref(self, cr, uid, context=None):
|
||||||
obj_data = self.pool.get('ir.model.data')
|
obj_data = self.pool.get('ir.model.data')
|
||||||
obj_financial_report = self.pool.get('account.financial.report')
|
obj_financial_report = self.pool.get('account.financial.report')
|
||||||
|
financial_report_ref = {}
|
||||||
|
for key, financial_report in [
|
||||||
|
('asset','account_financial_report_assets0'),
|
||||||
|
('liability','account_financial_report_liability0'),
|
||||||
|
('income','account_financial_report_income0'),
|
||||||
|
('expense','account_financial_report_expense0'),
|
||||||
|
]:
|
||||||
|
try:
|
||||||
|
financial_report_ref[key] = obj_financial_report.browse(cr, uid,
|
||||||
|
obj_data.get_object_reference(cr, uid, 'account', financial_report)[1],
|
||||||
|
context=context)
|
||||||
|
except ValueError:
|
||||||
|
pass
|
||||||
|
return financial_report_ref
|
||||||
|
|
||||||
|
def _get_current_report_type(self, cr, uid, ids, name, arg, context=None):
|
||||||
res = {}
|
res = {}
|
||||||
financial_report_ref = {
|
financial_report_ref = self._get_financial_report_ref(cr, uid, context=context)
|
||||||
'asset': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_assets0')[1], context=context),
|
|
||||||
'liability': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_liability0')[1], context=context),
|
|
||||||
'income': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_income0')[1], context=context),
|
|
||||||
'expense': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_expense0')[1], context=context),
|
|
||||||
}
|
|
||||||
for record in self.browse(cr, uid, ids, context=context):
|
for record in self.browse(cr, uid, ids, context=context):
|
||||||
res[record.id] = 'none'
|
res[record.id] = 'none'
|
||||||
for key, financial_report in financial_report_ref.items():
|
for key, financial_report in financial_report_ref.items():
|
||||||
|
@ -157,15 +168,9 @@ class account_account_type(osv.osv):
|
||||||
|
|
||||||
def _save_report_type(self, cr, uid, account_type_id, field_name, field_value, arg, context=None):
|
def _save_report_type(self, cr, uid, account_type_id, field_name, field_value, arg, context=None):
|
||||||
field_value = field_value or 'none'
|
field_value = field_value or 'none'
|
||||||
obj_data = self.pool.get('ir.model.data')
|
|
||||||
obj_financial_report = self.pool.get('account.financial.report')
|
obj_financial_report = self.pool.get('account.financial.report')
|
||||||
#unlink if it exists somewhere in the financial reports related to BS or PL
|
#unlink if it exists somewhere in the financial reports related to BS or PL
|
||||||
financial_report_ref = {
|
financial_report_ref = self._get_financial_report_ref(cr, uid, context=context)
|
||||||
'asset': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_assets0')[1], context=context),
|
|
||||||
'liability': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_liability0')[1], context=context),
|
|
||||||
'income': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_income0')[1], context=context),
|
|
||||||
'expense': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_expense0')[1], context=context),
|
|
||||||
}
|
|
||||||
for key, financial_report in financial_report_ref.items():
|
for key, financial_report in financial_report_ref.items():
|
||||||
list_ids = [x.id for x in financial_report.account_type_ids]
|
list_ids = [x.id for x in financial_report.account_type_ids]
|
||||||
if account_type_id in list_ids:
|
if account_type_id in list_ids:
|
||||||
|
@ -719,7 +724,7 @@ class account_journal(osv.osv):
|
||||||
'user_id': fields.many2one('res.users', 'User', help="The user responsible for this journal"),
|
'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'),
|
'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'),
|
'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
|
||||||
'entry_posted': fields.boolean('Skip \'Draft\' State for Manual Entries', help='Check this box if you don\'t want new journal entries to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation. \nNote that journal entries that are automatically created by the system are always skipping that state.'),
|
'entry_posted': fields.boolean('Autopost Created Moves', help='Check this box to automatically post entries of this journal. Note that legally, some entries may be automatically posted when the source document is validated (Invoices), whatever the status of this field.'),
|
||||||
'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"),
|
'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"),
|
||||||
'allow_date':fields.boolean('Check Date in Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),
|
'allow_date':fields.boolean('Check Date in Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),
|
||||||
|
|
||||||
|
@ -1258,6 +1263,10 @@ class account_move(osv.osv):
|
||||||
return [('id', 'in', tuple(ids))]
|
return [('id', 'in', tuple(ids))]
|
||||||
return [('id', '=', '0')]
|
return [('id', '=', '0')]
|
||||||
|
|
||||||
|
def _get_move_from_lines(self, cr, uid, ids, context=None):
|
||||||
|
line_obj = self.pool.get('account.move.line')
|
||||||
|
return [line.move_id.id for line in line_obj.browse(cr, uid, ids, context=context)]
|
||||||
|
|
||||||
_columns = {
|
_columns = {
|
||||||
'name': fields.char('Number', size=64, required=True),
|
'name': fields.char('Number', size=64, required=True),
|
||||||
'ref': fields.char('Reference', size=64),
|
'ref': fields.char('Reference', size=64),
|
||||||
|
@ -1267,7 +1276,10 @@ class account_move(osv.osv):
|
||||||
help='All manually created new journal entries are usually in the status \'Unposted\', but you can set the option to skip that status on the related journal. In that case, they will behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' status.'),
|
help='All manually created new journal entries are usually in the status \'Unposted\', but you can set the option to skip that status on the related journal. In that case, they will behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' status.'),
|
||||||
'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
|
'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
|
||||||
'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'),
|
'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'),
|
||||||
'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True),
|
'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store={
|
||||||
|
_name: (lambda self, cr,uid,ids,c: ids, ['line_id'], 10),
|
||||||
|
'account.move.line': (_get_move_from_lines, ['partner_id'],10)
|
||||||
|
}),
|
||||||
'amount': fields.function(_amount_compute, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount),
|
'amount': fields.function(_amount_compute, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount),
|
||||||
'date': fields.date('Date', required=True, states={'posted':[('readonly',True)]}, select=True),
|
'date': fields.date('Date', required=True, states={'posted':[('readonly',True)]}, select=True),
|
||||||
'narration':fields.text('Internal Note'),
|
'narration':fields.text('Internal Note'),
|
||||||
|
@ -1633,9 +1645,11 @@ class account_move(osv.osv):
|
||||||
else:
|
else:
|
||||||
# We can't validate it (it's unbalanced)
|
# We can't validate it (it's unbalanced)
|
||||||
# Setting the lines as draft
|
# Setting the lines as draft
|
||||||
obj_move_line.write(cr, uid, line_ids, {
|
not_draft_line_ids = list(set(line_ids) - set(line_draft_ids))
|
||||||
'state': 'draft'
|
if not_draft_line_ids:
|
||||||
}, context, check=False)
|
obj_move_line.write(cr, uid, not_draft_line_ids, {
|
||||||
|
'state': 'draft'
|
||||||
|
}, context, check=False)
|
||||||
# Create analytic lines for the valid moves
|
# Create analytic lines for the valid moves
|
||||||
for record in valid_moves:
|
for record in valid_moves:
|
||||||
obj_move_line.create_analytic_lines(cr, uid, [line.id for line in record.line_id], context)
|
obj_move_line.create_analytic_lines(cr, uid, [line.id for line in record.line_id], context)
|
||||||
|
|
|
@ -561,10 +561,14 @@ class account_invoice(osv.osv):
|
||||||
|
|
||||||
def onchange_payment_term_date_invoice(self, cr, uid, ids, payment_term_id, date_invoice):
|
def onchange_payment_term_date_invoice(self, cr, uid, ids, payment_term_id, date_invoice):
|
||||||
res = {}
|
res = {}
|
||||||
|
if isinstance(ids, (int, long)):
|
||||||
|
ids = [ids]
|
||||||
if not date_invoice:
|
if not date_invoice:
|
||||||
date_invoice = time.strftime('%Y-%m-%d')
|
date_invoice = time.strftime('%Y-%m-%d')
|
||||||
if not payment_term_id:
|
if not payment_term_id:
|
||||||
return {'value':{'date_due': date_invoice}} #To make sure the invoice has a due date when no payment term
|
inv = self.browse(cr, uid, ids[0])
|
||||||
|
#To make sure the invoice due date should contain due date which is entered by user when there is no payment term defined
|
||||||
|
return {'value':{'date_due': inv.date_due and inv.date_due or date_invoice}}
|
||||||
pterm_list = self.pool.get('account.payment.term').compute(cr, uid, payment_term_id, value=1, date_ref=date_invoice)
|
pterm_list = self.pool.get('account.payment.term').compute(cr, uid, payment_term_id, value=1, date_ref=date_invoice)
|
||||||
if pterm_list:
|
if pterm_list:
|
||||||
pterm_list = [line[0] for line in pterm_list]
|
pterm_list = [line[0] for line in pterm_list]
|
||||||
|
@ -1427,6 +1431,7 @@ class account_invoice_line(osv.osv):
|
||||||
|
|
||||||
_name = "account.invoice.line"
|
_name = "account.invoice.line"
|
||||||
_description = "Invoice Line"
|
_description = "Invoice Line"
|
||||||
|
_order = "invoice_id,sequence,id"
|
||||||
_columns = {
|
_columns = {
|
||||||
'name': fields.text('Description', required=True),
|
'name': fields.text('Description', required=True),
|
||||||
'origin': fields.char('Source Document', size=256, help="Reference of the document that produced this invoice."),
|
'origin': fields.char('Source Document', size=256, help="Reference of the document that produced this invoice."),
|
||||||
|
@ -1463,6 +1468,7 @@ class account_invoice_line(osv.osv):
|
||||||
'discount': 0.0,
|
'discount': 0.0,
|
||||||
'price_unit': _price_unit_default,
|
'price_unit': _price_unit_default,
|
||||||
'account_id': _default_account_id,
|
'account_id': _default_account_id,
|
||||||
|
'sequence': 10,
|
||||||
}
|
}
|
||||||
|
|
||||||
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
|
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
|
||||||
|
|
|
@ -192,6 +192,7 @@
|
||||||
<page string="Invoice">
|
<page string="Invoice">
|
||||||
<field context="{'partner_id': partner_id, 'price_type': context.get('price_type') or False, 'type': type}" name="invoice_line">
|
<field context="{'partner_id': partner_id, 'price_type': context.get('price_type') or False, 'type': type}" name="invoice_line">
|
||||||
<tree string="Invoice lines" editable="bottom">
|
<tree string="Invoice lines" editable="bottom">
|
||||||
|
<field name="sequence" widget="handle" />
|
||||||
<field name="product_id"
|
<field name="product_id"
|
||||||
on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
|
on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
|
||||||
<field name="name"/>
|
<field name="name"/>
|
||||||
|
@ -250,7 +251,7 @@
|
||||||
<group>
|
<group>
|
||||||
<group>
|
<group>
|
||||||
<field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
|
<field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
|
||||||
<field name="user_id"/>
|
<field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_invoice']}"/>
|
||||||
<field name="name" invisible="1"/>
|
<field name="name" invisible="1"/>
|
||||||
<field name="payment_term" widget="selection"/>
|
<field name="payment_term" widget="selection"/>
|
||||||
</group>
|
</group>
|
||||||
|
@ -392,7 +393,7 @@
|
||||||
<group col="4">
|
<group col="4">
|
||||||
<group>
|
<group>
|
||||||
<field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id,context)" widget="selection" groups="base.group_multi_company"/>
|
<field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id,context)" widget="selection" groups="base.group_multi_company"/>
|
||||||
<field name="user_id" groups="base.group_user"/>
|
<field name="user_id" groups="base.group_user" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_invoice']}"/>
|
||||||
<field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"/>
|
<field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"/>
|
||||||
<field name="period_id" domain="[('state', '=', 'draft'), ('company_id', '=', company_id)]"
|
<field name="period_id" domain="[('state', '=', 'draft'), ('company_id', '=', company_id)]"
|
||||||
groups="account.group_account_manager"
|
groups="account.group_account_manager"
|
||||||
|
@ -467,8 +468,8 @@
|
||||||
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
|
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
|
||||||
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
|
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
|
||||||
<filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
|
<filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
|
||||||
<filter string="Invoice Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_invoice'}"/>
|
<filter string="Invoice Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_invoice'}"/>
|
||||||
<filter string="Due Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_due'}"/>
|
<filter string="Due Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_due'}"/>
|
||||||
</group>
|
</group>
|
||||||
</search>
|
</search>
|
||||||
</field>
|
</field>
|
||||||
|
|
|
@ -800,7 +800,7 @@ class account_move_line(osv.osv):
|
||||||
r_id = move_rec_obj.create(cr, uid, {
|
r_id = move_rec_obj.create(cr, uid, {
|
||||||
'type': type,
|
'type': type,
|
||||||
'line_partial_ids': map(lambda x: (4,x,False), merges+unmerge)
|
'line_partial_ids': map(lambda x: (4,x,False), merges+unmerge)
|
||||||
})
|
}, context=context)
|
||||||
move_rec_obj.reconcile_partial_check(cr, uid, [r_id] + merges_rec, context=context)
|
move_rec_obj.reconcile_partial_check(cr, uid, [r_id] + merges_rec, context=context)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
|
@ -413,7 +413,7 @@
|
||||||
<page string="Advanced Settings">
|
<page string="Advanced Settings">
|
||||||
<group>
|
<group>
|
||||||
<group>
|
<group>
|
||||||
<field name="user_id"/>
|
<field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_user']}"/>
|
||||||
<field name="sequence_id" required="0"/>
|
<field name="sequence_id" required="0"/>
|
||||||
</group>
|
</group>
|
||||||
<group>
|
<group>
|
||||||
|
@ -612,6 +612,13 @@
|
||||||
</field>
|
</field>
|
||||||
</page>
|
</page>
|
||||||
</notebook>
|
</notebook>
|
||||||
|
<group class="oe_subtotal_footer oe_right" colspan="2" name="sale_total">
|
||||||
|
<div class="oe_subtotal_footer_separator oe_inline">
|
||||||
|
<label for="balance_end" />
|
||||||
|
</div>
|
||||||
|
<field name="balance_end" nolabel="1" class="oe_subtotal_footer_separator" widget='monetary' options="{'currency_field': 'currency_id'}"/>
|
||||||
|
</group>
|
||||||
|
<div class="oe_clear"/>
|
||||||
</sheet>
|
</sheet>
|
||||||
</form>
|
</form>
|
||||||
</field>
|
</field>
|
||||||
|
@ -1399,7 +1406,7 @@
|
||||||
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
|
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
|
||||||
<filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
|
<filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
|
||||||
<filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
|
<filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
|
||||||
<filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
|
<filter string="Entries Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" help="Journal Entries by Month"/>
|
||||||
</group>
|
</group>
|
||||||
</search>
|
</search>
|
||||||
</field>
|
</field>
|
||||||
|
|
|
@ -266,7 +266,7 @@ class account_invoice(osv.osv, EDIMixin):
|
||||||
params = {
|
params = {
|
||||||
"cmd": "_xclick",
|
"cmd": "_xclick",
|
||||||
"business": inv.company_id.paypal_account,
|
"business": inv.company_id.paypal_account,
|
||||||
"item_name": inv.company_id.name + " Invoice " + inv.number,
|
"item_name": "%s Invoice %s" % (inv.company_id.name, inv.number or ''),
|
||||||
"invoice": inv.number,
|
"invoice": inv.number,
|
||||||
"amount": inv.residual,
|
"amount": inv.residual,
|
||||||
"currency_code": inv.currency_id.name,
|
"currency_code": inv.currency_id.name,
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -14,8 +14,8 @@ msgstr ""
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
"X-Launchpad-Export-Date: 2013-06-30 05:55+0000\n"
|
"X-Launchpad-Export-Date: 2013-09-03 05:11+0000\n"
|
||||||
"X-Generator: Launchpad (build 16692)\n"
|
"X-Generator: Launchpad (build 16753)\n"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
|
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
|
||||||
|
|
|
@ -13,8 +13,8 @@ msgstr ""
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
"X-Launchpad-Export-Date: 2013-06-08 05:52+0000\n"
|
"X-Launchpad-Export-Date: 2013-09-03 05:13+0000\n"
|
||||||
"X-Generator: Launchpad (build 16667)\n"
|
"X-Generator: Launchpad (build 16753)\n"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
|
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
|
||||||
|
@ -25,7 +25,7 @@ msgstr "系统支付"
|
||||||
#: sql_constraint:account.fiscal.position.account:0
|
#: sql_constraint:account.fiscal.position.account:0
|
||||||
msgid ""
|
msgid ""
|
||||||
"An account fiscal position could be defined only once time on same accounts."
|
"An account fiscal position could be defined only once time on same accounts."
|
||||||
msgstr "在一个科目上只能设置一个应税设定"
|
msgstr "在一个科目上只能设置一个替换规则。"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: help:account.tax.code,sequence:0
|
#: help:account.tax.code,sequence:0
|
||||||
|
@ -130,10 +130,10 @@ msgstr "如果设置为false,该付款条款将会被隐藏。"
|
||||||
#: code:addons/account/account.py:686
|
#: code:addons/account/account.py:686
|
||||||
#: code:addons/account/account.py:781
|
#: code:addons/account/account.py:781
|
||||||
#: code:addons/account/account.py:1058
|
#: code:addons/account/account.py:1058
|
||||||
#: code:addons/account/account_invoice.py:817
|
|
||||||
#: code:addons/account/account_invoice.py:820
|
#: code:addons/account/account_invoice.py:820
|
||||||
#: code:addons/account/account_invoice.py:823
|
#: code:addons/account/account_invoice.py:823
|
||||||
#: code:addons/account/account_invoice.py:1542
|
#: code:addons/account/account_invoice.py:826
|
||||||
|
#: code:addons/account/account_invoice.py:1545
|
||||||
#: code:addons/account/account_move_line.py:98
|
#: code:addons/account/account_move_line.py:98
|
||||||
#: code:addons/account/account_move_line.py:771
|
#: code:addons/account/account_move_line.py:771
|
||||||
#: code:addons/account/account_move_line.py:824
|
#: code:addons/account/account_move_line.py:824
|
||||||
|
@ -348,7 +348,7 @@ msgid "Allow multi currencies"
|
||||||
msgstr "允许多种货币"
|
msgstr "允许多种货币"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_invoice.py:74
|
#: code:addons/account/account_invoice.py:77
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "You must define an analytic journal of type '%s'!"
|
msgid "You must define an analytic journal of type '%s'!"
|
||||||
msgstr "你必须定义一个类型为 '%s'的成本凭证簿!"
|
msgstr "你必须定义一个类型为 '%s'的成本凭证簿!"
|
||||||
|
@ -360,7 +360,7 @@ msgstr "你必须定义一个类型为 '%s'的成本凭证簿!"
|
||||||
#: selection:report.account.sales,month:0
|
#: selection:report.account.sales,month:0
|
||||||
#: selection:report.account_type.sales,month:0
|
#: selection:report.account_type.sales,month:0
|
||||||
msgid "June"
|
msgid "June"
|
||||||
msgstr "6"
|
msgstr "6月"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/wizard/account_automatic_reconcile.py:148
|
#: code:addons/account/wizard/account_automatic_reconcile.py:148
|
||||||
|
@ -442,7 +442,7 @@ msgstr ""
|
||||||
#. module: account
|
#. module: account
|
||||||
#: help:account.bank.statement.line,name:0
|
#: help:account.bank.statement.line,name:0
|
||||||
msgid "Originator to Beneficiary Information"
|
msgid "Originator to Beneficiary Information"
|
||||||
msgstr ""
|
msgstr "发起人到受益人的信息"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#. openerp-web
|
#. openerp-web
|
||||||
|
@ -462,7 +462,7 @@ msgstr "科目一览表模板"
|
||||||
#. module: account
|
#. module: account
|
||||||
#: selection:account.invoice.refund,filter_refund:0
|
#: selection:account.invoice.refund,filter_refund:0
|
||||||
msgid "Modify: create refund, reconcile and create a new draft invoice"
|
msgid "Modify: create refund, reconcile and create a new draft invoice"
|
||||||
msgstr ""
|
msgstr "修改:创建退款,核销并创建一个新的发票草稿"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: help:account.config.settings,tax_calculation_rounding_method:0
|
#: help:account.config.settings,tax_calculation_rounding_method:0
|
||||||
|
@ -528,7 +528,7 @@ msgstr "允许比较"
|
||||||
#: model:ir.model,name:account.model_account_journal
|
#: model:ir.model,name:account.model_account_journal
|
||||||
#: field:validate.account.move,journal_id:0
|
#: field:validate.account.move,journal_id:0
|
||||||
msgid "Journal"
|
msgid "Journal"
|
||||||
msgstr "账簿"
|
msgstr "凭证"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: model:ir.model,name:account.model_account_invoice_confirm
|
#: model:ir.model,name:account.model_account_invoice_confirm
|
||||||
|
@ -548,7 +548,7 @@ msgstr "显示发票的时候给出明细编号。"
|
||||||
#. module: account
|
#. module: account
|
||||||
#: field:account.bank.statement,account_id:0
|
#: field:account.bank.statement,account_id:0
|
||||||
msgid "Account used in this journal"
|
msgid "Account used in this journal"
|
||||||
msgstr "这账簿上的科目"
|
msgstr "凭证上的科目"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: help:account.aged.trial.balance,chart_account_id:0
|
#: help:account.aged.trial.balance,chart_account_id:0
|
||||||
|
@ -617,7 +617,7 @@ msgstr "没有什么被核销"
|
||||||
#. module: account
|
#. module: account
|
||||||
#: field:account.config.settings,decimal_precision:0
|
#: field:account.config.settings,decimal_precision:0
|
||||||
msgid "Decimal precision on journal entries"
|
msgid "Decimal precision on journal entries"
|
||||||
msgstr "日记帐分录小数精度"
|
msgstr "凭证分录小数精度"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: selection:account.config.settings,period:0
|
#: selection:account.config.settings,period:0
|
||||||
|
@ -745,7 +745,9 @@ msgstr "设置辅助核算项,用于退款时发票上默认税科目。如果
|
||||||
#: selection:account.common.partner.report,result_selection:0
|
#: selection:account.common.partner.report,result_selection:0
|
||||||
#: selection:account.partner.balance,result_selection:0
|
#: selection:account.partner.balance,result_selection:0
|
||||||
#: selection:account.partner.ledger,result_selection:0
|
#: selection:account.partner.ledger,result_selection:0
|
||||||
|
#: report:account.third_party_ledger:0
|
||||||
#: code:addons/account/report/account_partner_balance.py:297
|
#: code:addons/account/report/account_partner_balance.py:297
|
||||||
|
#: code:addons/account/report/account_partner_ledger.py:272
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Receivable Accounts"
|
msgid "Receivable Accounts"
|
||||||
msgstr "应收款科目"
|
msgstr "应收款科目"
|
||||||
|
@ -783,7 +785,7 @@ msgid "Are you sure you want to create entries?"
|
||||||
msgstr "你确定创建分录?"
|
msgstr "你确定创建分录?"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_invoice.py:1358
|
#: code:addons/account/account_invoice.py:1361
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
|
msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
|
||||||
msgstr "发票已经支付:%s%s ,总额: %s%s (剩余:%s%s )。"
|
msgstr "发票已经支付:%s%s ,总额: %s%s (剩余:%s%s )。"
|
||||||
|
@ -852,7 +854,7 @@ msgid "Type"
|
||||||
msgstr "类型"
|
msgstr "类型"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_invoice.py:823
|
#: code:addons/account/account_invoice.py:826
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"Taxes are missing!\n"
|
"Taxes are missing!\n"
|
||||||
|
@ -1035,7 +1037,7 @@ msgid "Liability"
|
||||||
msgstr "负债"
|
msgstr "负债"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_invoice.py:896
|
#: code:addons/account/account_invoice.py:899
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Please define sequence on the journal related to this invoice."
|
msgid "Please define sequence on the journal related to this invoice."
|
||||||
msgstr "请为这张发票对应的凭证簿选择编号规则"
|
msgstr "请为这张发票对应的凭证簿选择编号规则"
|
||||||
|
@ -1108,8 +1110,8 @@ msgstr "特性"
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account.py:2346
|
#: code:addons/account/account.py:2346
|
||||||
#: code:addons/account/account_bank_statement.py:424
|
#: code:addons/account/account_bank_statement.py:424
|
||||||
#: code:addons/account/account_invoice.py:74
|
#: code:addons/account/account_invoice.py:77
|
||||||
#: code:addons/account/account_invoice.py:772
|
#: code:addons/account/account_invoice.py:775
|
||||||
#: code:addons/account/account_move_line.py:195
|
#: code:addons/account/account_move_line.py:195
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "No Analytic Journal !"
|
msgid "No Analytic Journal !"
|
||||||
|
@ -1547,8 +1549,10 @@ msgid "%s (copy)"
|
||||||
msgstr "%s (副本)"
|
msgstr "%s (副本)"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
|
#: report:account.account.balance:0
|
||||||
#: selection:account.balance.report,display_account:0
|
#: selection:account.balance.report,display_account:0
|
||||||
#: selection:account.common.account.report,display_account:0
|
#: selection:account.common.account.report,display_account:0
|
||||||
|
#: report:account.general.ledger_landscape:0
|
||||||
#: selection:account.partner.balance,display_partner:0
|
#: selection:account.partner.balance,display_partner:0
|
||||||
#: selection:account.report.general.ledger,display_account:0
|
#: selection:account.report.general.ledger,display_account:0
|
||||||
msgid "With balance is not equal to 0"
|
msgid "With balance is not equal to 0"
|
||||||
|
@ -1642,7 +1646,7 @@ msgstr "# 分录 "
|
||||||
msgid ""
|
msgid ""
|
||||||
"By unchecking the active field, you may hide a fiscal position without "
|
"By unchecking the active field, you may hide a fiscal position without "
|
||||||
"deleting it."
|
"deleting it."
|
||||||
msgstr "如不勾选该项,可以隐藏而不删除此应税条件"
|
msgstr "如不勾选该项,可以隐藏而不删除此替换规则。"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: model:ir.model,name:account.model_temp_range
|
#: model:ir.model,name:account.model_temp_range
|
||||||
|
@ -1685,7 +1689,7 @@ msgstr "定期分录"
|
||||||
#. module: account
|
#. module: account
|
||||||
#: model:ir.model,name:account.model_account_fiscal_position_template
|
#: model:ir.model,name:account.model_account_fiscal_position_template
|
||||||
msgid "Template for Fiscal Position"
|
msgid "Template for Fiscal Position"
|
||||||
msgstr "财务结构模板"
|
msgstr "替换规则模板"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: view:account.subscription:0
|
#: view:account.subscription:0
|
||||||
|
@ -1780,7 +1784,7 @@ msgstr ""
|
||||||
#: view:account.invoice:0
|
#: view:account.invoice:0
|
||||||
#: view:account.invoice.report:0
|
#: view:account.invoice.report:0
|
||||||
#: field:account.move.line,invoice:0
|
#: field:account.move.line,invoice:0
|
||||||
#: code:addons/account/account_invoice.py:1154
|
#: code:addons/account/account_invoice.py:1157
|
||||||
#: model:ir.model,name:account.model_account_invoice
|
#: model:ir.model,name:account.model_account_invoice
|
||||||
#: model:res.request.link,name:account.req_link_invoice
|
#: model:res.request.link,name:account.req_link_invoice
|
||||||
#, python-format
|
#, python-format
|
||||||
|
@ -2033,9 +2037,9 @@ msgstr ""
|
||||||
#: code:addons/account/account_bank_statement.py:419
|
#: code:addons/account/account_bank_statement.py:419
|
||||||
#: code:addons/account/account_cash_statement.py:256
|
#: code:addons/account/account_cash_statement.py:256
|
||||||
#: code:addons/account/account_cash_statement.py:300
|
#: code:addons/account/account_cash_statement.py:300
|
||||||
#: code:addons/account/account_invoice.py:896
|
#: code:addons/account/account_invoice.py:899
|
||||||
#: code:addons/account/account_invoice.py:930
|
#: code:addons/account/account_invoice.py:933
|
||||||
#: code:addons/account/account_invoice.py:1121
|
#: code:addons/account/account_invoice.py:1124
|
||||||
#: code:addons/account/account_move_line.py:579
|
#: code:addons/account/account_move_line.py:579
|
||||||
#: code:addons/account/account_move_line.py:828
|
#: code:addons/account/account_move_line.py:828
|
||||||
#: code:addons/account/account_move_line.py:851
|
#: code:addons/account/account_move_line.py:851
|
||||||
|
@ -2232,7 +2236,7 @@ msgstr "流水帐"
|
||||||
#. module: account
|
#. module: account
|
||||||
#: sql_constraint:account.fiscal.position.tax:0
|
#: sql_constraint:account.fiscal.position.tax:0
|
||||||
msgid "A tax fiscal position could be defined only once time on same taxes."
|
msgid "A tax fiscal position could be defined only once time on same taxes."
|
||||||
msgstr "同样的税 上面一次只能定义一个财务结构。"
|
msgstr "同样的税上面一次只能定义一个税务替换规则。"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: view:account.tax:0
|
#: view:account.tax:0
|
||||||
|
@ -2277,7 +2281,9 @@ msgstr "固定资产管理"
|
||||||
#: selection:account.common.partner.report,result_selection:0
|
#: selection:account.common.partner.report,result_selection:0
|
||||||
#: selection:account.partner.balance,result_selection:0
|
#: selection:account.partner.balance,result_selection:0
|
||||||
#: selection:account.partner.ledger,result_selection:0
|
#: selection:account.partner.ledger,result_selection:0
|
||||||
|
#: report:account.third_party_ledger:0
|
||||||
#: code:addons/account/report/account_partner_balance.py:299
|
#: code:addons/account/report/account_partner_balance.py:299
|
||||||
|
#: code:addons/account/report/account_partner_ledger.py:274
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Payable Accounts"
|
msgid "Payable Accounts"
|
||||||
msgstr "应付款科目"
|
msgstr "应付款科目"
|
||||||
|
@ -2582,7 +2588,7 @@ msgid "Create an Account Based on this Template"
|
||||||
msgstr "基于此模板创建科目"
|
msgstr "基于此模板创建科目"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_invoice.py:930
|
#: code:addons/account/account_invoice.py:933
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"Cannot create the invoice.\n"
|
"Cannot create the invoice.\n"
|
||||||
|
@ -2624,7 +2630,7 @@ msgstr "付款条款"
|
||||||
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
|
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
|
||||||
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
|
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
|
||||||
msgid "Fiscal Positions"
|
msgid "Fiscal Positions"
|
||||||
msgstr "财务结构"
|
msgstr "替换规则"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_move_line.py:579
|
#: code:addons/account/account_move_line.py:579
|
||||||
|
@ -2851,11 +2857,11 @@ msgstr "科目"
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account.py:3541
|
#: code:addons/account/account.py:3541
|
||||||
#: code:addons/account/account_bank_statement.py:405
|
#: code:addons/account/account_bank_statement.py:405
|
||||||
#: code:addons/account/account_invoice.py:504
|
#: code:addons/account/account_invoice.py:507
|
||||||
#: code:addons/account/account_invoice.py:606
|
#: code:addons/account/account_invoice.py:609
|
||||||
#: code:addons/account/account_invoice.py:621
|
#: code:addons/account/account_invoice.py:624
|
||||||
#: code:addons/account/account_invoice.py:629
|
#: code:addons/account/account_invoice.py:632
|
||||||
#: code:addons/account/account_invoice.py:654
|
#: code:addons/account/account_invoice.py:657
|
||||||
#: code:addons/account/account_move_line.py:536
|
#: code:addons/account/account_move_line.py:536
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Configuration Error!"
|
msgid "Configuration Error!"
|
||||||
|
@ -3088,7 +3094,7 @@ msgstr "销售分类帐"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account.py:2346
|
#: code:addons/account/account.py:2346
|
||||||
#: code:addons/account/account_invoice.py:772
|
#: code:addons/account/account_invoice.py:775
|
||||||
#: code:addons/account/account_move_line.py:195
|
#: code:addons/account/account_move_line.py:195
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "You have to define an analytic journal on the '%s' journal!"
|
msgid "You have to define an analytic journal on the '%s' journal!"
|
||||||
|
@ -3244,10 +3250,10 @@ msgstr "盈利或亏损"
|
||||||
#: model:ir.model,name:account.model_account_fiscal_position
|
#: model:ir.model,name:account.model_account_fiscal_position
|
||||||
#: field:res.partner,property_account_position:0
|
#: field:res.partner,property_account_position:0
|
||||||
msgid "Fiscal Position"
|
msgid "Fiscal Position"
|
||||||
msgstr "财务结构"
|
msgstr "替换规则"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_invoice.py:820
|
#: code:addons/account/account_invoice.py:823
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"Tax base different!\n"
|
"Tax base different!\n"
|
||||||
|
@ -3407,7 +3413,7 @@ msgstr "视图"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account.py:3460
|
#: code:addons/account/account.py:3460
|
||||||
#: code:addons/account/account_bank.py:95
|
#: code:addons/account/account_bank.py:94
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "BNK"
|
msgid "BNK"
|
||||||
msgstr "BNK"
|
msgstr "BNK"
|
||||||
|
@ -3668,7 +3674,7 @@ msgid ""
|
||||||
msgstr "如果您指定其它名称,它创建的凭证或分录将用报表名相同的名称。这使得报表它自己关联相似的分录。"
|
msgstr "如果您指定其它名称,它创建的凭证或分录将用报表名相同的名称。这使得报表它自己关联相似的分录。"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_invoice.py:1013
|
#: code:addons/account/account_invoice.py:1016
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"You cannot create an invoice on a centralized journal. Uncheck the "
|
"You cannot create an invoice on a centralized journal. Uncheck the "
|
||||||
|
@ -3683,7 +3689,7 @@ msgid "Starting Balance"
|
||||||
msgstr "期初余额"
|
msgstr "期初余额"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_invoice.py:1462
|
#: code:addons/account/account_invoice.py:1465
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "No Partner Defined !"
|
msgid "No Partner Defined !"
|
||||||
msgstr "未定义业务伙伴!"
|
msgstr "未定义业务伙伴!"
|
||||||
|
@ -3952,9 +3958,13 @@ msgid "VAT :"
|
||||||
msgstr "增值税 :"
|
msgstr "增值税 :"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
|
#: report:account.account.balance:0
|
||||||
#: report:account.central.journal:0
|
#: report:account.central.journal:0
|
||||||
#: view:account.config.settings:0
|
#: view:account.config.settings:0
|
||||||
|
#: report:account.general.journal:0
|
||||||
#: report:account.general.ledger:0
|
#: report:account.general.ledger:0
|
||||||
|
#: report:account.general.ledger_landscape:0
|
||||||
|
#: report:account.journal.period.print:0
|
||||||
#: report:account.partner.balance:0
|
#: report:account.partner.balance:0
|
||||||
#: report:account.third_party_ledger:0
|
#: report:account.third_party_ledger:0
|
||||||
#: report:account.third_party_ledger_other:0
|
#: report:account.third_party_ledger_other:0
|
||||||
|
@ -4054,8 +4064,10 @@ msgstr ""
|
||||||
"请在业务伙伴里定义它"
|
"请在业务伙伴里定义它"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
|
#: report:account.account.balance:0
|
||||||
#: selection:account.balance.report,display_account:0
|
#: selection:account.balance.report,display_account:0
|
||||||
#: selection:account.common.account.report,display_account:0
|
#: selection:account.common.account.report,display_account:0
|
||||||
|
#: report:account.general.ledger_landscape:0
|
||||||
#: selection:account.report.general.ledger,display_account:0
|
#: selection:account.report.general.ledger,display_account:0
|
||||||
#: selection:account.tax,type_tax_use:0
|
#: selection:account.tax,type_tax_use:0
|
||||||
#: selection:account.tax.template,type_tax_use:0
|
#: selection:account.tax.template,type_tax_use:0
|
||||||
|
@ -4310,7 +4322,7 @@ msgid "Consolidated Children"
|
||||||
msgstr "合并子科目"
|
msgstr "合并子科目"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_invoice.py:570
|
#: code:addons/account/account_invoice.py:573
|
||||||
#: code:addons/account/wizard/account_invoice_refund.py:146
|
#: code:addons/account/wizard/account_invoice_refund.py:146
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Insufficient Data!"
|
msgid "Insufficient Data!"
|
||||||
|
@ -4579,8 +4591,8 @@ msgid "Supplier invoice sequence"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_invoice.py:607
|
#: code:addons/account/account_invoice.py:610
|
||||||
#: code:addons/account/account_invoice.py:622
|
#: code:addons/account/account_invoice.py:625
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"Cannot find a chart of account, you should create one from Settings\\"
|
"Cannot find a chart of account, you should create one from Settings\\"
|
||||||
|
@ -4853,7 +4865,7 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_invoice.py:655
|
#: code:addons/account/account_invoice.py:658
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"Cannot find any account journal of %s type for this company.\n"
|
"Cannot find any account journal of %s type for this company.\n"
|
||||||
|
@ -5177,7 +5189,7 @@ msgid "Tax Application"
|
||||||
msgstr "税适用"
|
msgstr "税适用"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_invoice.py:919
|
#: code:addons/account/account_invoice.py:922
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"Please verify the price of the invoice !\n"
|
"Please verify the price of the invoice !\n"
|
||||||
|
@ -5502,7 +5514,7 @@ msgid "Compute Code (if type=code)"
|
||||||
msgstr "计算代码(如果类型=代码)"
|
msgstr "计算代码(如果类型=代码)"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_invoice.py:505
|
#: code:addons/account/account_invoice.py:508
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"Cannot find a chart of accounts for this company, you should create one."
|
"Cannot find a chart of accounts for this company, you should create one."
|
||||||
|
@ -5902,7 +5914,7 @@ msgstr ""
|
||||||
#: view:account.fiscal.position.template:0
|
#: view:account.fiscal.position.template:0
|
||||||
#: field:account.fiscal.position.template,name:0
|
#: field:account.fiscal.position.template,name:0
|
||||||
msgid "Fiscal Position Template"
|
msgid "Fiscal Position Template"
|
||||||
msgstr "财务结构模板"
|
msgstr "替换规则模版"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: view:account.invoice:0
|
#: view:account.invoice:0
|
||||||
|
@ -6037,7 +6049,7 @@ msgstr "收入"
|
||||||
#: view:account.config.settings:0
|
#: view:account.config.settings:0
|
||||||
#: view:account.invoice:0
|
#: view:account.invoice:0
|
||||||
#: view:account.invoice.report:0
|
#: view:account.invoice.report:0
|
||||||
#: code:addons/account/account_invoice.py:387
|
#: code:addons/account/account_invoice.py:390
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Supplier"
|
msgid "Supplier"
|
||||||
msgstr "供应商"
|
msgstr "供应商"
|
||||||
|
@ -6057,7 +6069,7 @@ msgid "Account n°"
|
||||||
msgstr "科目编码"
|
msgstr "科目编码"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_invoice.py:92
|
#: code:addons/account/account_invoice.py:95
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Free Reference"
|
msgid "Free Reference"
|
||||||
msgstr "无限制的单号"
|
msgstr "无限制的单号"
|
||||||
|
@ -6067,7 +6079,9 @@ msgstr "无限制的单号"
|
||||||
#: selection:account.common.partner.report,result_selection:0
|
#: selection:account.common.partner.report,result_selection:0
|
||||||
#: selection:account.partner.balance,result_selection:0
|
#: selection:account.partner.balance,result_selection:0
|
||||||
#: selection:account.partner.ledger,result_selection:0
|
#: selection:account.partner.ledger,result_selection:0
|
||||||
|
#: report:account.third_party_ledger:0
|
||||||
#: code:addons/account/report/account_partner_balance.py:301
|
#: code:addons/account/report/account_partner_balance.py:301
|
||||||
|
#: code:addons/account/report/account_partner_ledger.py:276
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Receivable and Payable Accounts"
|
msgid "Receivable and Payable Accounts"
|
||||||
msgstr "应收款与应付款科目"
|
msgstr "应收款与应付款科目"
|
||||||
|
@ -6234,7 +6248,7 @@ msgstr "报表"
|
||||||
#. module: account
|
#. module: account
|
||||||
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
|
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
|
||||||
msgid "Template Tax Fiscal Position"
|
msgid "Template Tax Fiscal Position"
|
||||||
msgstr "税务的模板"
|
msgstr "税务替换规则的模板"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: help:account.tax,name:0
|
#: help:account.tax,name:0
|
||||||
|
@ -6293,7 +6307,7 @@ msgstr "生成循环分录"
|
||||||
#. module: account
|
#. module: account
|
||||||
#: report:account.invoice:0
|
#: report:account.invoice:0
|
||||||
msgid "Fiscal Position Remark :"
|
msgid "Fiscal Position Remark :"
|
||||||
msgstr "财务状况备注:"
|
msgstr "替换规则备注:"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: view:analytic.entries.report:0
|
#: view:analytic.entries.report:0
|
||||||
|
@ -6365,7 +6379,7 @@ msgid "Models"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_invoice.py:1121
|
#: code:addons/account/account_invoice.py:1124
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"You cannot cancel an invoice which is partially paid. You need to "
|
"You cannot cancel an invoice which is partially paid. You need to "
|
||||||
|
@ -6537,7 +6551,7 @@ msgid "You cannot create journal items on closed account."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_invoice.py:630
|
#: code:addons/account/account_invoice.py:633
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Invoice line account's company and invoice's compnay does not match."
|
msgid "Invoice line account's company and invoice's compnay does not match."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
@ -6686,7 +6700,7 @@ msgstr "序列字段用于税从低到高排序, 如果税中有子税这排序
|
||||||
#: code:addons/account/account.py:1453
|
#: code:addons/account/account.py:1453
|
||||||
#: code:addons/account/account.py:1482
|
#: code:addons/account/account.py:1482
|
||||||
#: code:addons/account/account.py:1489
|
#: code:addons/account/account.py:1489
|
||||||
#: code:addons/account/account_invoice.py:1012
|
#: code:addons/account/account_invoice.py:1015
|
||||||
#: code:addons/account/account_move_line.py:1005
|
#: code:addons/account/account_move_line.py:1005
|
||||||
#: code:addons/account/wizard/account_automatic_reconcile.py:148
|
#: code:addons/account/wizard/account_automatic_reconcile.py:148
|
||||||
#: code:addons/account/wizard/account_fiscalyear_close.py:88
|
#: code:addons/account/wizard/account_fiscalyear_close.py:88
|
||||||
|
@ -6765,7 +6779,7 @@ msgstr "你不能修改已经存在凭证的公司帐户。"
|
||||||
#: report:account.invoice:0
|
#: report:account.invoice:0
|
||||||
#: selection:account.invoice,type:0
|
#: selection:account.invoice,type:0
|
||||||
#: selection:account.invoice.report,type:0
|
#: selection:account.invoice.report,type:0
|
||||||
#: code:addons/account/account_invoice.py:1157
|
#: code:addons/account/account_invoice.py:1160
|
||||||
#: selection:report.invoice.created,type:0
|
#: selection:report.invoice.created,type:0
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Supplier Refund"
|
msgid "Supplier Refund"
|
||||||
|
@ -7174,7 +7188,7 @@ msgstr "科目核销"
|
||||||
#. module: account
|
#. module: account
|
||||||
#: model:ir.model,name:account.model_account_fiscal_position_tax
|
#: model:ir.model,name:account.model_account_fiscal_position_tax
|
||||||
msgid "Taxes Fiscal Position"
|
msgid "Taxes Fiscal Position"
|
||||||
msgstr "税负"
|
msgstr "税负替换规则"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: report:account.general.ledger:0
|
#: report:account.general.ledger:0
|
||||||
|
@ -7896,7 +7910,7 @@ msgid "May"
|
||||||
msgstr "5"
|
msgstr "5"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_invoice.py:817
|
#: code:addons/account/account_invoice.py:820
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Global taxes defined, but they are not in invoice lines !"
|
msgid "Global taxes defined, but they are not in invoice lines !"
|
||||||
msgstr "定义了全局税,但发票行中没有!"
|
msgstr "定义了全局税,但发票行中没有!"
|
||||||
|
@ -7937,7 +7951,7 @@ msgstr "登账"
|
||||||
#: view:account.config.settings:0
|
#: view:account.config.settings:0
|
||||||
#: view:account.invoice:0
|
#: view:account.invoice:0
|
||||||
#: view:account.invoice.report:0
|
#: view:account.invoice.report:0
|
||||||
#: code:addons/account/account_invoice.py:385
|
#: code:addons/account/account_invoice.py:388
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Customer"
|
msgid "Customer"
|
||||||
msgstr "客户"
|
msgstr "客户"
|
||||||
|
@ -8185,7 +8199,7 @@ msgid "Select a currency to apply on the invoice"
|
||||||
msgstr "在发票上选择合适的币别"
|
msgstr "在发票上选择合适的币别"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_invoice.py:898
|
#: code:addons/account/account_invoice.py:901
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "No Invoice Lines !"
|
msgid "No Invoice Lines !"
|
||||||
msgstr "没有发票明细"
|
msgstr "没有发票明细"
|
||||||
|
@ -8262,7 +8276,7 @@ msgid "Associated Partner"
|
||||||
msgstr "相关业务伙伴"
|
msgstr "相关业务伙伴"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_invoice.py:1462
|
#: code:addons/account/account_invoice.py:1465
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "You must first select a partner !"
|
msgid "You must first select a partner !"
|
||||||
msgstr "你必须首先选择一个业务伙伴!"
|
msgstr "你必须首先选择一个业务伙伴!"
|
||||||
|
@ -8452,7 +8466,7 @@ msgstr "已调整的余额"
|
||||||
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
|
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
|
||||||
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
|
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
|
||||||
msgid "Fiscal Position Templates"
|
msgid "Fiscal Position Templates"
|
||||||
msgstr "财务结构模板"
|
msgstr "替换规则模板"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: view:account.entries.report:0
|
#: view:account.entries.report:0
|
||||||
|
@ -8744,7 +8758,7 @@ msgstr "到期日期"
|
||||||
#: model:ir.ui.menu,name:account.menu_account_supplier
|
#: model:ir.ui.menu,name:account.menu_account_supplier
|
||||||
#: model:ir.ui.menu,name:account.menu_finance_payables
|
#: model:ir.ui.menu,name:account.menu_finance_payables
|
||||||
msgid "Suppliers"
|
msgid "Suppliers"
|
||||||
msgstr "供应商列表"
|
msgstr "供应商"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: view:account.journal:0
|
#: view:account.journal:0
|
||||||
|
@ -9208,7 +9222,7 @@ msgid "Purchase Tax(%)"
|
||||||
msgstr "进项税(%)"
|
msgstr "进项税(%)"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_invoice.py:898
|
#: code:addons/account/account_invoice.py:901
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Please create some invoice lines."
|
msgid "Please create some invoice lines."
|
||||||
msgstr "请创建发票明细。"
|
msgstr "请创建发票明细。"
|
||||||
|
@ -9764,7 +9778,7 @@ msgid "Unreconciled"
|
||||||
msgstr "反核销"
|
msgstr "反核销"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_invoice.py:919
|
#: code:addons/account/account_invoice.py:922
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Bad total !"
|
msgid "Bad total !"
|
||||||
msgstr "坏的合计!"
|
msgstr "坏的合计!"
|
||||||
|
@ -10237,6 +10251,7 @@ msgstr "开始银行对账"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: field:account.account,company_id:0
|
#: field:account.account,company_id:0
|
||||||
|
#: report:account.account.balance:0
|
||||||
#: field:account.aged.trial.balance,company_id:0
|
#: field:account.aged.trial.balance,company_id:0
|
||||||
#: field:account.analytic.journal,company_id:0
|
#: field:account.analytic.journal,company_id:0
|
||||||
#: field:account.balance.report,company_id:0
|
#: field:account.balance.report,company_id:0
|
||||||
|
@ -10252,7 +10267,9 @@ msgstr "开始银行对账"
|
||||||
#: field:account.entries.report,company_id:0
|
#: field:account.entries.report,company_id:0
|
||||||
#: field:account.fiscal.position,company_id:0
|
#: field:account.fiscal.position,company_id:0
|
||||||
#: field:account.fiscalyear,company_id:0
|
#: field:account.fiscalyear,company_id:0
|
||||||
|
#: report:account.general.journal:0
|
||||||
#: field:account.general.journal,company_id:0
|
#: field:account.general.journal,company_id:0
|
||||||
|
#: report:account.general.ledger_landscape:0
|
||||||
#: field:account.installer,company_id:0
|
#: field:account.installer,company_id:0
|
||||||
#: field:account.invoice,company_id:0
|
#: field:account.invoice,company_id:0
|
||||||
#: field:account.invoice.line,company_id:0
|
#: field:account.invoice.line,company_id:0
|
||||||
|
@ -10261,6 +10278,7 @@ msgstr "开始银行对账"
|
||||||
#: field:account.invoice.tax,company_id:0
|
#: field:account.invoice.tax,company_id:0
|
||||||
#: field:account.journal,company_id:0
|
#: field:account.journal,company_id:0
|
||||||
#: field:account.journal.period,company_id:0
|
#: field:account.journal.period,company_id:0
|
||||||
|
#: report:account.journal.period.print:0
|
||||||
#: field:account.model,company_id:0
|
#: field:account.model,company_id:0
|
||||||
#: field:account.move,company_id:0
|
#: field:account.move,company_id:0
|
||||||
#: field:account.move.line,company_id:0
|
#: field:account.move.line,company_id:0
|
||||||
|
@ -10414,14 +10432,14 @@ msgstr "销售科目的报表"
|
||||||
#. module: account
|
#. module: account
|
||||||
#: model:ir.model,name:account.model_account_fiscal_position_account
|
#: model:ir.model,name:account.model_account_fiscal_position_account
|
||||||
msgid "Accounts Fiscal Position"
|
msgid "Accounts Fiscal Position"
|
||||||
msgstr "财务结构"
|
msgstr "替换规则"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: report:account.invoice:0
|
#: report:account.invoice:0
|
||||||
#: view:account.invoice:0
|
#: view:account.invoice:0
|
||||||
#: selection:account.invoice,type:0
|
#: selection:account.invoice,type:0
|
||||||
#: selection:account.invoice.report,type:0
|
#: selection:account.invoice.report,type:0
|
||||||
#: code:addons/account/account_invoice.py:1155
|
#: code:addons/account/account_invoice.py:1158
|
||||||
#: model:process.process,name:account.process_process_supplierinvoiceprocess0
|
#: model:process.process,name:account.process_process_supplierinvoiceprocess0
|
||||||
#: selection:report.invoice.created,type:0
|
#: selection:report.invoice.created,type:0
|
||||||
#, python-format
|
#, python-format
|
||||||
|
@ -10511,8 +10529,10 @@ msgstr ""
|
||||||
"内部类型用于对不同类型的科目进行控制:视图科目不能做凭证,合并科目用于在多公司合并中指定子科目,应收应付科目用于业务伙伴,关闭科目用于不再使用的科目。"
|
"内部类型用于对不同类型的科目进行控制:视图科目不能做凭证,合并科目用于在多公司合并中指定子科目,应收应付科目用于业务伙伴,关闭科目用于不再使用的科目。"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
|
#: report:account.account.balance:0
|
||||||
#: selection:account.balance.report,display_account:0
|
#: selection:account.balance.report,display_account:0
|
||||||
#: selection:account.common.account.report,display_account:0
|
#: selection:account.common.account.report,display_account:0
|
||||||
|
#: report:account.general.ledger_landscape:0
|
||||||
#: selection:account.report.general.ledger,display_account:0
|
#: selection:account.report.general.ledger,display_account:0
|
||||||
msgid "With movements"
|
msgid "With movements"
|
||||||
msgstr "进展"
|
msgstr "进展"
|
||||||
|
@ -10607,7 +10627,7 @@ msgid "Entries Sorted by"
|
||||||
msgstr "排序依据:"
|
msgstr "排序依据:"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_invoice.py:1543
|
#: code:addons/account/account_invoice.py:1546
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"The selected unit of measure is not compatible with the unit of measure of "
|
"The selected unit of measure is not compatible with the unit of measure of "
|
||||||
|
@ -10688,7 +10708,7 @@ msgstr "搜索发票"
|
||||||
#: report:account.invoice:0
|
#: report:account.invoice:0
|
||||||
#: view:account.invoice:0
|
#: view:account.invoice:0
|
||||||
#: view:account.invoice.report:0
|
#: view:account.invoice.report:0
|
||||||
#: code:addons/account/account_invoice.py:1156
|
#: code:addons/account/account_invoice.py:1159
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Refund"
|
msgid "Refund"
|
||||||
msgstr "红字发票"
|
msgstr "红字发票"
|
||||||
|
@ -10731,7 +10751,7 @@ msgstr "使凭证行生效"
|
||||||
#: help:res.partner,property_account_position:0
|
#: help:res.partner,property_account_position:0
|
||||||
msgid ""
|
msgid ""
|
||||||
"The fiscal position will determine taxes and accounts used for the partner."
|
"The fiscal position will determine taxes and accounts used for the partner."
|
||||||
msgstr ""
|
msgstr "替换规则将决定合作伙伴说使用的税和科目"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: model:process.node,note:account.process_node_supplierpaidinvoice0
|
#: model:process.node,note:account.process_node_supplierpaidinvoice0
|
||||||
|
@ -10760,7 +10780,7 @@ msgid "Manual Invoice Taxes"
|
||||||
msgstr "手动的发票税(非主营业务纳税)"
|
msgstr "手动的发票税(非主营业务纳税)"
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_invoice.py:570
|
#: code:addons/account/account_invoice.py:573
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "The payment term of supplier does not have a payment term line."
|
msgid "The payment term of supplier does not have a payment term line."
|
||||||
msgstr "供应商付款条件没有包含付款条件行"
|
msgstr "供应商付款条件没有包含付款条件行"
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -133,7 +133,7 @@
|
||||||
<field name="name"/>
|
<field name="name"/>
|
||||||
<field name="account_id"/>
|
<field name="account_id"/>
|
||||||
<field name="journal_id"/>
|
<field name="journal_id"/>
|
||||||
<field name="user_id"/>
|
<field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_invoice']}"/>
|
||||||
</group>
|
</group>
|
||||||
<group>
|
<group>
|
||||||
<field name="date"/>
|
<field name="date"/>
|
||||||
|
@ -206,7 +206,7 @@
|
||||||
<filter string="Product" context="{'group_by':'product_id'}"/>
|
<filter string="Product" context="{'group_by':'product_id'}"/>
|
||||||
<filter string="User" context="{'group_by':'user_id'}"/>
|
<filter string="User" context="{'group_by':'user_id'}"/>
|
||||||
<separator/>
|
<separator/>
|
||||||
<filter string="Date" context="{'group_by':'date'}" name="group_date"/>
|
<filter string="Tasks Month" context="{'group_by':'date'}" name="group_date" help="Invoice Tasks by Month"/>
|
||||||
|
|
||||||
</group>
|
</group>
|
||||||
</search>
|
</search>
|
||||||
|
|
|
@ -7,16 +7,16 @@
|
||||||
<field name="model">account.analytic.chart</field>
|
<field name="model">account.analytic.chart</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<form string="Analytic Account Charts" version="7.0">
|
<form string="Analytic Account Charts" version="7.0">
|
||||||
<header>
|
|
||||||
<button name="analytic_account_chart_open_window" string="Open Charts" type="object" class="oe_highlight"/>
|
|
||||||
or
|
|
||||||
<button string="Cancel" class="oe_link" special="cancel"/>
|
|
||||||
</header>
|
|
||||||
<group string="Select the Period for Analysis" col="4">
|
<group string="Select the Period for Analysis" col="4">
|
||||||
<field name="from_date"/>
|
<field name="from_date"/>
|
||||||
<field name="to_date"/>
|
<field name="to_date"/>
|
||||||
<label string="(Keep empty to open the current situation)" colspan="4"/>
|
<label string="(Keep empty to open the current situation)" colspan="4"/>
|
||||||
</group>
|
</group>
|
||||||
|
<footer>
|
||||||
|
<button name="analytic_account_chart_open_window" string="Open Charts" type="object" class="oe_highlight"/>
|
||||||
|
or
|
||||||
|
<button string="Cancel" class="oe_link" special="cancel"/>
|
||||||
|
</footer>
|
||||||
</form>
|
</form>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
|
@ -366,12 +366,13 @@ class aged_trial_report(report_sxw.rml_parse, common_report_header):
|
||||||
return period or 0.0
|
return period or 0.0
|
||||||
|
|
||||||
def _get_partners(self,data):
|
def _get_partners(self,data):
|
||||||
|
# TODO: deprecated, to remove in trunk
|
||||||
if data['form']['result_selection'] == 'customer':
|
if data['form']['result_selection'] == 'customer':
|
||||||
return 'Receivable Accounts'
|
return self._translate('Receivable Accounts')
|
||||||
elif data['form']['result_selection'] == 'supplier':
|
elif data['form']['result_selection'] == 'supplier':
|
||||||
return 'Payable Accounts'
|
return self._translate('Payable Accounts')
|
||||||
elif data['form']['result_selection'] == 'customer_supplier':
|
elif data['form']['result_selection'] == 'customer_supplier':
|
||||||
return 'Receivable and Payable Accounts'
|
return self._translate('Receivable and Payable Accounts')
|
||||||
return ''
|
return ''
|
||||||
|
|
||||||
report_sxw.report_sxw('report.account.aged_trial_balance', 'res.partner',
|
report_sxw.report_sxw('report.account.aged_trial_balance', 'res.partner',
|
||||||
|
|
|
@ -147,7 +147,9 @@
|
||||||
<para style="terp_default_Centre_8">[[ data['form']['period_length'] ]]</para>
|
<para style="terp_default_Centre_8">[[ data['form']['period_length'] ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Centre_8">[[ get_partners(data) ]]</para>
|
<para style="terp_default_Centre_8">Receivable Accounts[[ data['form']['result_selection'] == 'customer' or removeParentNode('para') ]]</para>
|
||||||
|
<para style="terp_default_Centre_8">Payable Accounts[[ data['form']['result_selection'] == 'supplier' or removeParentNode('para') ]]</para>
|
||||||
|
<para style="terp_default_Centre_8">Receivable and Payable Accounts[[ data['form']['result_selection'] == 'customer_supplier' or removeParentNode('para') ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Centre_8">[[ data['form']['direction_selection'] ]]</para>
|
<para style="terp_default_Centre_8">[[ data['form']['direction_selection'] ]]</para>
|
||||||
|
@ -166,7 +168,8 @@
|
||||||
<para style="terp_tblheader_Details">Partners</para>
|
<para style="terp_tblheader_Details">Partners</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_Details_Right">[[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]]</para>
|
<para style="terp_tblheader_Details_Right">Due[[ data['form']['direction_selection'] == 'future' and ' ' or removeParentNode('para') ]]</para>
|
||||||
|
<para style="terp_tblheader_Details_Right">Not due[[ data['form']['direction_selection'] != 'future' and ' ' or removeParentNode('para') ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_Details_Right">[[ data['form']['4']['name'] ]]</para>
|
<para style="terp_tblheader_Details_Right">[[ data['form']['4']['name'] ]]</para>
|
||||||
|
|
|
@ -211,8 +211,10 @@
|
||||||
</para>
|
</para>
|
||||||
<blockTable colWidths="130.0,80.0,100.0,140.0,90.0" style="Table8">
|
<blockTable colWidths="130.0,80.0,100.0,140.0,90.0" style="Table8">
|
||||||
<tr>
|
<tr>
|
||||||
<td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company'or removeParentNode('para') ]]</para>
|
<td>
|
||||||
<para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></td>
|
<para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.account' and ' ' or removeParentNode('para') ]]</para>
|
||||||
|
<para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para>
|
||||||
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_General_Centre">Fiscal Year</para>
|
<para style="terp_tblheader_General_Centre">Fiscal Year</para>
|
||||||
</td>
|
</td>
|
||||||
|
@ -233,7 +235,11 @@
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para>
|
<para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
|
<td>
|
||||||
|
<para style="terp_default_Centre_7">All[[ data['form']['display_account']=='all' and ' ' or removeParentNode('para') ]]</para>
|
||||||
|
<para style="terp_default_Centre_7">With movements[[ data['form']['display_account']=='movement' and ' ' or removeParentNode('para') ]]</para>
|
||||||
|
<para style="terp_default_Centre_7">With balance is not equal to 0[[ data['form']['display_account']=='not_zero' and ' ' or removeParentNode('para') ]]</para>
|
||||||
|
</td>
|
||||||
<td> <para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
|
<td> <para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
|
||||||
<blockTable colWidths="60.0,60.0" style="Table5">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
|
<blockTable colWidths="60.0,60.0" style="Table5">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
|
||||||
<tr>
|
<tr>
|
||||||
|
|
|
@ -92,7 +92,7 @@
|
||||||
<filter string="Acc.Type" icon="terp-stock_symbol-selection" context="{'group_by':'user_type'}" name="usertype"/>
|
<filter string="Acc.Type" icon="terp-stock_symbol-selection" context="{'group_by':'user_type'}" name="usertype"/>
|
||||||
<filter string="Int.Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
|
<filter string="Int.Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
|
||||||
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
|
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
|
||||||
<filter string="Date" icon="terp-go-today" context="{'group_by':'date'}"/>
|
<filter string="Entries Month" icon="terp-go-today" context="{'group_by':'date'}" help="Entries Date by Month"/>
|
||||||
<filter string="Period" icon="terp-go-month" name="group_period" context="{'group_by':'period_id'}"/>
|
<filter string="Period" icon="terp-go-month" name="group_period" context="{'group_by':'period_id'}"/>
|
||||||
<filter string="Fiscal Year" icon="terp-go-year" context="{'group_by':'fiscalyear_id'}"/>
|
<filter string="Fiscal Year" icon="terp-go-year" context="{'group_by':'fiscalyear_id'}"/>
|
||||||
</group>
|
</group>
|
||||||
|
|
|
@ -38,6 +38,7 @@ class report_account_common(report_sxw.rml_parse, common_report_header):
|
||||||
'get_filter': self._get_filter,
|
'get_filter': self._get_filter,
|
||||||
'get_start_date':self._get_start_date,
|
'get_start_date':self._get_start_date,
|
||||||
'get_end_date':self._get_end_date,
|
'get_end_date':self._get_end_date,
|
||||||
|
'get_target_move': self._get_target_move,
|
||||||
})
|
})
|
||||||
self.context = context
|
self.context = context
|
||||||
|
|
||||||
|
|
|
@ -166,11 +166,12 @@
|
||||||
<para style="Standard">
|
<para style="Standard">
|
||||||
<font color="white"> </font>
|
<font color="white"> </font>
|
||||||
</para>
|
</para>
|
||||||
<blockTable colWidths="163.0,163.0,163.0" style="Table2_header">
|
<blockTable colWidths="122.0,122.0,122.0,122.0" style="Table2_header">
|
||||||
<tr>
|
<tr>
|
||||||
<td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td>
|
<td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td>
|
||||||
<td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
|
<td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
|
||||||
<td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filters' and get_filter(data) ]]</para></td>
|
<td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filters' and get_filter(data) ]]</para></td>
|
||||||
|
<td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
|
<td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
|
||||||
|
@ -197,6 +198,10 @@
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
</td>
|
</td>
|
||||||
|
<td>
|
||||||
|
<para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
|
||||||
|
</td>
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
<para style="Standard">
|
<para style="Standard">
|
||||||
|
|
|
@ -220,8 +220,8 @@
|
||||||
</blockTable>
|
</blockTable>
|
||||||
<blockTable colWidths="80.0,100,80.0,150.0,100.0" style="Table2">
|
<blockTable colWidths="80.0,100,80.0,150.0,100.0" style="Table2">
|
||||||
<tr>
|
<tr>
|
||||||
<td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]]</para>
|
<td><para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.journal.period' and ' ' or removeParentNode('para') ]]</para>
|
||||||
<para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></td>
|
<para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para></td>
|
||||||
<td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
|
<td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
|
||||||
<td><para style="terp_tblheader_General_Centre">Journals</para></td>
|
<td><para style="terp_tblheader_General_Centre">Journals</para></td>
|
||||||
<td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>
|
<td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>
|
||||||
|
|
|
@ -360,9 +360,8 @@
|
||||||
<blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table1">
|
<blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table1">
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company' or removeParentNode('para') ]]</para>
|
<para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.account' and ' ' or removeParentNode('para') ]]</para>
|
||||||
<para style="terp_tblheader_General_Centre">[[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para>
|
<para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para></td>
|
||||||
</td>
|
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_General_Centre">Fiscal Year</para>
|
<para style="terp_tblheader_General_Centre">Fiscal Year</para>
|
||||||
</td>
|
</td>
|
||||||
|
@ -395,7 +394,9 @@
|
||||||
<para style="terp_default_Centre_7">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
|
<para style="terp_default_Centre_7">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Centre_7">[[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para>
|
<para style="terp_default_Centre_7">All[[ data['form']['display_account']=='all' and ' ' or removeParentNode('para') ]]</para>
|
||||||
|
<para style="terp_default_Centre_7">With movements[[ data['form']['display_account']=='movement' and ' ' or removeParentNode('para') ]]</para>
|
||||||
|
<para style="terp_default_Centre_7">With balance is not equal to 0[[ data['form']['display_account']=='not_zero' and ' ' or removeParentNode('para') ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Centre_7">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]]</para>
|
<para style="terp_default_Centre_7">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]]</para>
|
||||||
|
|
|
@ -71,7 +71,7 @@
|
||||||
<filter string="Commercial Partner" name="commercial_partner_id" context="{'group_by':'commercial_partner_id','residual_visible':True}"/>
|
<filter string="Commercial Partner" name="commercial_partner_id" context="{'group_by':'commercial_partner_id','residual_visible':True}"/>
|
||||||
<filter string="Commercial Partner's Country" name="country_id" context="{'group_by':'country_id'}"/>
|
<filter string="Commercial Partner's Country" name="country_id" context="{'group_by':'country_id'}"/>
|
||||||
<filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
|
<filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
|
||||||
<filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/>
|
<filter string="Due Month" icon="terp-go-today" context="{'group_by':'date_due'}"/>
|
||||||
<filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}" name="period"/>
|
<filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}" name="period"/>
|
||||||
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True,'residual_invisible':True}"/>
|
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True,'residual_invisible':True}"/>
|
||||||
<filter string="Category of Product" name="category_product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id','residual_invisible':True}"/>
|
<filter string="Category of Product" name="category_product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id','residual_invisible':True}"/>
|
||||||
|
|
|
@ -189,11 +189,12 @@ class journal_print(report_sxw.rml_parse, common_report_header):
|
||||||
return data['form']['amount_currency']
|
return data['form']['amount_currency']
|
||||||
|
|
||||||
def _get_sortby(self, data):
|
def _get_sortby(self, data):
|
||||||
|
# TODO: deprecated, to remove in trunk
|
||||||
if self.sort_selection == 'date':
|
if self.sort_selection == 'date':
|
||||||
return 'Date'
|
return self._translate('Date')
|
||||||
elif self.sort_selection == 'ref':
|
elif self.sort_selection == 'ref':
|
||||||
return 'Reference Number'
|
return self._translate('Reference Number')
|
||||||
return 'Date'
|
return self._translate('Date')
|
||||||
|
|
||||||
report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print, header='external')
|
report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print, header='external')
|
||||||
report_sxw.report_sxw('report.account.journal.period.print.sale.purchase', 'account.journal.period', 'addons/account/report/account_journal_sale_purchase.rml', parser=journal_print, header='external')
|
report_sxw.report_sxw('report.account.journal.period.print.sale.purchase', 'account.journal.period', 'addons/account/report/account_journal_sale_purchase.rml', parser=journal_print, header='external')
|
||||||
|
|
|
@ -186,8 +186,8 @@
|
||||||
</para>
|
</para>
|
||||||
<blockTable colWidths="85.0,80.0,80.0,120.0,70.0,100.0" style="Table2">
|
<blockTable colWidths="85.0,80.0,80.0,120.0,70.0,100.0" style="Table2">
|
||||||
<tr>
|
<tr>
|
||||||
<td><para style="terp_tblheader_General_Centre"> [[ data['model']=='account.journal.period'and 'Company' or removeParentNode('para') ]]</para>
|
<td><para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.journal.period'and ' ' or removeParentNode('para') ]]</para>
|
||||||
<para style="terp_tblheader_General_Centre">[[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></td>
|
<para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para></td>
|
||||||
<td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
|
<td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
|
||||||
<td><para style="terp_tblheader_General_Centre">Journal</para></td>
|
<td><para style="terp_tblheader_General_Centre">Journal</para></td>
|
||||||
<td><para style="terp_tblheader_General_Centre">Period</para></td>
|
<td><para style="terp_tblheader_General_Centre">Period</para></td>
|
||||||
|
@ -199,8 +199,10 @@
|
||||||
<td><para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para></td>
|
<td><para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para></td>
|
||||||
<td><para style="terp_default_Centre_8">[[ o.journal_id.name ]]</para></td>
|
<td><para style="terp_default_Centre_8">[[ o.journal_id.name ]]</para></td>
|
||||||
<td><para style="terp_default_Centre_8">[[ o.period_id.name ]] </para></td>
|
<td><para style="terp_default_Centre_8">[[ o.period_id.name ]] </para></td>
|
||||||
<td><para style="terp_default_Centre_8">[[ get_sortby(data) ]]</para></td>
|
<td>
|
||||||
<td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
|
<para style="terp_default_Centre_8">Date[[ data['form'].get('sort_selection', 'date') == 'date' and ' ' or removeParentNode('para') ]]</para>
|
||||||
|
<para style="terp_default_Centre_8">Reference Number[[ data['form'].get('sort_selection', 'date') == 'ref' and ' ' or removeParentNode('para') ]]</para>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
<para style="P9">
|
<para style="P9">
|
||||||
|
|
|
@ -267,12 +267,13 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header):
|
||||||
return result_tmp + result_init
|
return result_tmp + result_init
|
||||||
|
|
||||||
def _get_partners(self):
|
def _get_partners(self):
|
||||||
|
# TODO: deprecated, to remove in trunk
|
||||||
if self.result_selection == 'customer':
|
if self.result_selection == 'customer':
|
||||||
return 'Receivable Accounts'
|
return _('Receivable Accounts')
|
||||||
elif self.result_selection == 'supplier':
|
elif self.result_selection == 'supplier':
|
||||||
return 'Payable Accounts'
|
return _('Payable Accounts')
|
||||||
elif self.result_selection == 'customer_supplier':
|
elif self.result_selection == 'customer_supplier':
|
||||||
return 'Receivable and Payable Accounts'
|
return _('Receivable and Payable Accounts')
|
||||||
return ''
|
return ''
|
||||||
|
|
||||||
def _sum_currency_amount_account(self, account, form):
|
def _sum_currency_amount_account(self, account, form):
|
||||||
|
|
|
@ -423,7 +423,9 @@
|
||||||
</para>
|
</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Centre_8">[[ get_partners() ]]</para>
|
<para style="terp_default_Centre_8">Receivable Accounts[[ data['form'].get('result_selection', 'customer') == 'customer' or removeParentNode('para') ]]</para>
|
||||||
|
<para style="terp_default_Centre_8">Payable Accounts[[ data['form'].get('result_selection', 'customer') == 'supplier' or removeParentNode('para') ]]</para>
|
||||||
|
<para style="terp_default_Centre_8">Receivable and Payable Accounts[[ data['form'].get('result_selection', 'customer') == 'customer_supplier' or removeParentNode('para') ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
|
<para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
|
||||||
|
|
|
@ -25,7 +25,7 @@ from dateutil.relativedelta import relativedelta
|
||||||
from operator import itemgetter
|
from operator import itemgetter
|
||||||
from os.path import join as opj
|
from os.path import join as opj
|
||||||
|
|
||||||
from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT as DF
|
from openerp.tools import DEFAULT_SERVER_DATE_FORMAT as DF
|
||||||
from openerp.tools.translate import _
|
from openerp.tools.translate import _
|
||||||
from openerp.osv import fields, osv
|
from openerp.osv import fields, osv
|
||||||
from openerp import tools
|
from openerp import tools
|
||||||
|
|
|
@ -17,7 +17,7 @@ By far the most beautiful and full featured accounting software. OpenERP Account
|
||||||
Activate features on demand, from integrated analytic accounting to budget, assets and multiple companies consolidation.
|
Activate features on demand, from integrated analytic accounting to budget, assets and multiple companies consolidation.
|
||||||
</p>
|
</p>
|
||||||
<div class="oe_centeralign oe_websiteonly">
|
<div class="oe_centeralign oe_websiteonly">
|
||||||
<a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
|
<a href="http://www.openerp.com/start?app=account" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -84,7 +84,7 @@ openerp.account.quickadd = function (instance) {
|
||||||
},
|
},
|
||||||
search_by_journal_period: function() {
|
search_by_journal_period: function() {
|
||||||
var self = this;
|
var self = this;
|
||||||
var domain = [];
|
var domain = ['|',['debit', '!=', 0], ['credit', '!=', 0]];
|
||||||
if (self.current_journal !== null) domain.push(["journal_id", "=", self.current_journal]);
|
if (self.current_journal !== null) domain.push(["journal_id", "=", self.current_journal]);
|
||||||
if (self.current_period !== null) domain.push(["period_id", "=", self.current_period]);
|
if (self.current_period !== null) domain.push(["period_id", "=", self.current_period]);
|
||||||
self.last_context["journal_id"] = self.current_journal === null ? false : self.current_journal;
|
self.last_context["journal_id"] = self.current_journal === null ? false : self.current_journal;
|
||||||
|
|
|
@ -67,9 +67,10 @@
|
||||||
Then I cancel Bank Statements and verifies that it raises a warning
|
Then I cancel Bank Statements and verifies that it raises a warning
|
||||||
-
|
-
|
||||||
!python {model: account.bank.statement}: |
|
!python {model: account.bank.statement}: |
|
||||||
|
from openerp.osv import osv
|
||||||
try:
|
try:
|
||||||
self.button_cancel(cr, uid, [ref("account_bank_statement_0")])
|
self.button_cancel(cr, uid, [ref("account_bank_statement_0")])
|
||||||
assert False, "An exception should have been raised, the journal should not let us cancel moves!"
|
assert False, "An exception should have been raised, the journal should not let us cancel moves!"
|
||||||
except Exception:
|
except osv.except_osv:
|
||||||
# exception was raised as expected, as the journal does not allow cancelling moves
|
# exception was raised as expected, as the journal does not allow cancelling moves
|
||||||
pass
|
pass
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue