odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] improvement and Bug fix according to piratpad topics 

bzr revid: psi@tinyerp.co.in-20100618133957-1qumx8x585dlouwc
This commit is contained in:
psi (Open ERP) 2010-06-18 19:09:57 +05:30
parent bd3226b73f
commit 65fbde0dbb
21 changed files with 192 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
addons/account_analytic_default/account_analytic_default_view.xml
View File

@ -6,7 +6,7 @@
<field name="model">account.analytic.default</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Analytic Defaults" editable="bottom">
<tree string="Analytic Defaults">
<field name="sequence"/>
<field name="analytic_id" required="1"/>
<field name="product_id"/>
@ -18,17 +18,18 @@
</tree>
</field>
</record>
<record id="view_account_analytic_default_form" model="ir.ui.view">
<field name="name">account.analytic.default.form</field>
<field name="model">account.analytic.default</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Analytic Defaults">
<field name="analytic_id" select="1" required="1"/>
<field name="analytic_id" required="1"/>
<field name="sequence"/>
<separator string="Conditions" colspan="4"/>
<field name="product_id" select="1"/>
<field name="partner_id" select="1"/>
<field name="product_id"/>
<field name="partner_id"/>
<field name="user_id"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="date_start"/>
@ -36,11 +37,27 @@
</form>
</field>
</record>
<record id="view_account_analytic_default_form_search" model="ir.ui.view">
<field name="name">account.analytic.default.search</field>
<field name="model">account.analytic.default</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Accounts">
<field name="analytic_id"/>
<field name="product_id"/>
<field name="partner_id"/>
<field name="user_id"/>
<field name="company_id"/>
</search>
</field>
</record>
<record id="action_analytic_default_form" model="ir.actions.act_window">
<field name="name">Analytic Defaults</field>
<field name="res_model">account.analytic.default</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_account_analytic_default_form_search"/>
</record>
<!-- <menuitem-->
<!-- action="action_analytic_default_form"-->
@ -48,7 +65,12 @@
<!-- parent="account.menu_analytic_accounting"/>-->
<act_window
domain="[('account_id', '=', active_id)]" id="act_account_acount_move_line_open" name="Entries" res_model="account.move.line" src_model="account.account"/>
name="Entries"
id="act_account_acount_move_line_open"
res_model="account.move.line"
src_model="account.account"
domain="[('account_id', '=', active_id)]"/>
<act_window
name="Analytic Rules"
id="analytic_rule_action_partner"
@ -56,12 +78,14 @@
src_model="res.partner"
domain="[('partner_id','=',active_id)]"
groups="base.group_extended"/>
<act_window
name="Analytic Rules"
id="analytic_rule_action_user"
res_model="account.analytic.default"
src_model="res.users"
domain="[('user_id','=',active_id)]"/>
<act_window
name="Analytic Rules"
res_model="account.analytic.default"

5
addons/account_budget/crossovered_budget_view.xml
View File

@ -75,11 +75,6 @@
<page string="Accounts">
<field name="account_ids" colspan="4" nolabel="1"/>
</page>
<page string="Dotations">
<button string="Spread" name="%(action_account_budget_spread)d" type="action" icon="gtk-fullscreen"/>
<field name="dotation_ids" colspan="4" nolabel="1"/>
</page>
<page string="Budget Lines">
<field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="graph,tree">
<graph type="bar" string="Lines">

15
addons/account_budget/wizard/account_budget_analytic_view.xml
View File

@ -8,12 +8,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Select Dates Period">
<field name="date_from"/>
<field name="date_to"/>
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
<group width="450">
<separator string="This wizard is used to print budget" colspan="4"/>
<field name="date_from"/>
<field name="date_to"/>
<separator colspan="4"/>
<group colspan="4" col="6">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
</group>
</group>
</form>
</field>

15
addons/account_budget/wizard/account_budget_crossovered_report_view.xml
View File

@ -8,12 +8,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Select Dates Period">
<field name="date_from"/>
<field name="date_to"/>
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
<group width="450">
<separator string="This wizard is used to print budget" colspan="4"/>
<field name="date_from"/>
<field name="date_to"/>
<separator colspan="4"/>
<group colspan="4" col="6">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
</group>
</group>
</form>
</field>

17
addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
View File

@ -8,13 +8,16 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Select Dates Period">
<field name="date_from"/>
<field name="date_to"/>
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
</group>
<group width="450">
<separator string="This wizard is used to print summary of budgets" colspan="4"/>
<field name="date_from"/>
<field name="date_to"/>
<separator colspan="4"/>
<group colspan="4" col="6">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
</group>
</group>
</form>
</field>
</record>

17
addons/account_budget/wizard/account_budget_report_view.xml
View File

@ -8,13 +8,16 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Select Dates Period">
<field name="date1"/>
<field name="date2"/>
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
</group>
<group width="450">
<separator string="Print Budgets" colspan="4"/>
<field name="date1"/>
<field name="date2"/>
<separator colspan="4"/>
<group colspan="4" col="6">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
</group>
</group>
</form>
</field>
</record>

18
addons/account_budget/wizard/account_budget_spread_view.xml
View File

@ -7,14 +7,16 @@
<field name="model">account.budget.spread</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Select Dates Period">
<field name="fiscalyear"/>
<field name="amount"/>
<separator colspan="4"/>
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_spread" string="Ok" type="object" icon="gtk-ok" default_focus="1"/>
<form string="Select Fiscalyear">
<group width="480">
<separator string="" colspan="4"/>
<field name="fiscalyear"/>
<field name="amount"/>
<separator colspan="4"/>
<group colspan="4" col="6">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_spread" string="Ok" type="object" icon="gtk-ok"/>
</group>
</group>
</form>
</field>

2
addons/account_coda/coda.py
View File

@ -27,7 +27,7 @@ class account_coda(osv.osv):
_description = "coda for an Account"
_columns = {
'name': fields.binary('Coda file', readonly=True),
'statement_ids': fields.one2many('account.bank.statement','coda_id','Generated Bank Statement', readonly=True),
'statement_ids': fields.one2many('account.bank.statement','coda_id','Generated Bank Statements', readonly=True),
'note': fields.text('Import log', readonly=True),
'journal_id': fields.many2one('account.journal','Bank Journal', readonly=True, select=True),
'date': fields.date('Import Date', readonly=True, select=True),

16
addons/account_coda/coda_view.xml
View File

@ -12,14 +12,14 @@
<field name="journal_id" />
<field name="date" />
<field name="user_id" />
<notebook colspan="4">
<page string="Log">
<field name="note" colspan="4"/>
</page>
<page string="Statements">
<field name="statement_ids" colspan="4"/>
</page>
</notebook>
<notebook colspan="4">
<page string="Log">
<field name="note" colspan="4" nolabel="1"/>
</page>
<page string="Statements">
<field name="statement_ids" colspan="4" nolabel="1"/>
</page>
</notebook>
</form>
</field>
</record>

2
addons/account_coda/wizard/coda_import.py
View File

@ -124,7 +124,7 @@ def _coda_parsing(self, cr, uid, data, context):
bank_statement['date'] = str2date(line[5:11])
bank_statement['journal_id']=data['form']['journal_id']
period_id = pool.get('account.period').search(cr, uid, [('date_start','<=',time.strftime('%Y-%m-%d',time.strptime(bank_statement['date'],"%y/%m/%d"))),('date_stop','>=',time.strftime('%Y-%m-%d',time.strptime(bank_statement['date'],"%y/%m/%d")))])
bank_statement['period_id'] = period_id[0]
bank_statement['period_id'] = period_id and period_id[0] or False
bank_statement['state']='draft'
elif line[0] == '1':
# old balance data

6
addons/account_followup/__openerp__.py
View File

@ -28,11 +28,11 @@
Modules to automate letters for unpaid invoices, with multi-level recalls.
You can define your multiple levels of recall through the menu:
Financial Management/Configuration/Payment Terms/Follow-Ups
Financial Management/Configuration/Follow-Ups
Once it's defined, you can automatically print recalls every day
through simply clicking on the menu:
Financial_Management/Periodical_Processing/Print_Follow-Ups
Financial Management/Periodical Processing/Send followups
It will generate a PDF with all the letters according the the
different levels of recall defined. You can define different policies
@ -40,7 +40,7 @@
Note that if you want to change the followup level for a given partner/account entry, you can do it in the menu:
Financial_Management/Reporting/Follow-Ups/All Receivable Entries
Financial Management/Reporting/Follow-Ups/All receivable entries
""",
'author': 'Tiny',

3
addons/account_followup/wizard/account_followup_print.py
View File

@ -171,14 +171,13 @@ class account_followup_print_all(osv.osv_memory):
data = self.read(cr, uid, ids, [])[0]
model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_account_followup_print_all_msg')], context=context)
resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
if data['email_conf']:
mail_notsent = ''
msg_sent = ''
msg_unsent = ''
count = 0
data_user = user_obj.browse(cr, uid, uid)
move_lines = line_obj.browse(cr, uid, data['partner_ids'][0][2])
move_lines = line_obj.browse(cr, uid, data['partner_ids'])
partners = []
dict_lines = {}
for line in move_lines:

8
addons/account_payment/account_payment_view.xml
View File

@ -45,11 +45,11 @@
<field name="model">payment.type</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Payment Type">
<field name="name" select="1"/>
<form string="Payment Type">
<field name="name"/>
<field name="code"/>
<newline/>
<field colspan="4" name="suitable_bank_types" select="1"/>
<separator string="Suitable Bank Types" colspan="4"/>
<field name="suitable_bank_types" nolabel="1" colspan="4"/>
</form>
</field>
</record>

26
addons/account_report/wizard/account_report_print_indicators_view.xml
View File

@ -8,14 +8,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Indicators">
<label string="Select the criteria based on which Indicators will be printed."/>
<newline/>
<group width="450">
<separator string="Select the criteria based on which Indicators will be printed." colspan="4"/>
<field name="select_base"/>
<separator string="" colspan="4"/>
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="next" string="Next" type="object" icon="gtk-ok" default_focus="1"/>
<separator colspan="4"/>
<group colspan="4" col="6">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="next" string="Next" type="object" icon="gtk-ok" default_focus="1"/>
</group>
</group>
</form>
</field>
@ -31,9 +31,11 @@
<field name="target">new</field>
</record>
<menuitem action="action_account_report_print_indicators"
name="Print Indicators"
parent="account_report.menu_action_account_report_tree_view" id="menu_wizard_print_indicators"/>
<menuitem
action="action_account_report_print_indicators"
name="Print Indicators"
parent="account_report.menu_action_account_report_tree_view"
id="menu_wizard_print_indicators"/>
<record id="account_report_print_indicators_relation_view" model="ir.ui.view">
<field name="name">account.report.print.indicators.relation.form</field>
@ -41,10 +43,10 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Indicators">
<newline/>
<separator string="" colspan="4"/>
<newline/>
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<newline/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
</group>

8
addons/account_report_india/wizard/account_bs_report_view.xml
View File

@ -8,16 +8,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Select period">
<group width="660" height="480">
<field name="company_id"/>
<field name="display_account" required = "True"/>
<newline/>
<field name="fiscalyear"/>
<label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
<field name="display_type"/>
<newline/>
<separator string="Filters" colspan="4"/>
<field name="state" required="True"/>
<newline/>
<group attrs="{'invisible':[('state','=','none')]}" colspan="4">
<group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
<separator string="Date Filter" colspan="4"/>
@ -29,12 +27,12 @@
<field name="periods" colspan="4" nolabel="1"/>
</group>
</group>
<newline/>
<separator colspan="4"/>
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_state" string="Print" type="object" icon="gtk-print" default_focus="1"/>
</group>
</group>
</form>
</field>
</record>

50
addons/account_report_india/wizard/account_pl_report_view.xml
View File

@ -8,32 +8,30 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Select period">
<field name="company_id"/>
<field name="display_account" required = "True"/>
<newline/>
<field name="fiscalyear"/>
<label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
<field name="display_type"/>
<newline/>
<separator string="Filters" colspan="4"/>
<field name="state" required="True"/>
<newline/>
<group attrs="{'invisible':[('state','=','none')]}" colspan="4">
<group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
<separator string="Date Filter" colspan="4"/>
<field name="date_from"/>
<field name="date_to"/>
</group>
<group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
<separator string="Filter on Periods" colspan="4"/>
<field name="periods" colspan="4" nolabel="1"/>
</group>
</group>
<newline/>
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_state" string="Print" type="object" icon="gtk-print" default_focus="1"/>
<group width="660" height="480">
<field name="company_id"/>
<field name="display_account" required = "True"/>
<field name="fiscalyear"/>
<label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
<field name="display_type"/>
<separator string="Filters" colspan="4"/>
<field name="state" required="True"/>
<group attrs="{'invisible':[('state','=','none')]}" colspan="4">
<group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
<separator string="Date Filter" colspan="4"/>
<field name="date_from"/>
<field name="date_to"/>
</group>
<group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
<separator string="Filter on Periods" colspan="4"/>
<field name="periods" colspan="4" nolabel="1"/>
</group>
</group>
<separator colspan="4"/>
<group colspan="4" col="6">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_state" string="Print" type="object" icon="gtk-print" default_focus="1"/>
</group>
</group>
</form>
</field>

31
addons/account_reporting/account_view.xml
View File

@ -9,21 +9,22 @@
<field name="arch" type="xml">
<form string="Account reporting">
<notebook>
<page string="General">
<field name="name" select="1" colspan="3"/>
<field name="code" select="1"/>
<field name="parent_id" select="1" />
<field name="sequence"/>
<field name="color_font"/>
<field name="color_back"/>
<field name="font_style" />
<field name="report_type" />
<newline/>
<separator string="Accounts" colspan="4"/>
<field name="account_id" colspan="4" nolabel="1"/>
</page><page string="Notes">
<field name="note" nolabel="1" colspan="4"/>
</page>
<page string="General">
<field name="name" colspan="2"/>
<field name="code"/>
<field name="parent_id"/>
<field name="sequence"/>
<field name="color_font"/>
<field name="color_back"/>
<field name="font_style"/>
<field name="report_type"/>
<newline/>
<separator string="Accounts" colspan="4"/>
<field name="account_id" colspan="4" nolabel="1"/>
</page>
<page string="Notes">
<field name="note" nolabel="1" colspan="4"/>
</page>
</notebook>
</form>
</field>

17
addons/account_reporting/wizard/account_reporting_balance_report_view.xml
View File

@ -8,13 +8,16 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Select Dates Period">
<field name="fiscalyear"/>
<newline/>
<field name="periods"/>
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
<group height="350" width="390">
<field name="fiscalyear" colspan="4"/>
<newline/>
<separator string="Periods" colspan="4"/>
<field name="periods" nolabel="1" colspan="4"/>
<separator colspan="4"/>
<group colspan="4" col="6">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
</group>
</group>
</form>
</field>

2
addons/account_voucher/voucher.py
View File

@ -51,7 +51,7 @@ ir_sequence_type()
class account_journal(osv.osv):
_inherit = "account.journal"
_columns = {
'max_amount': fields.float('Verify Transection', digits=(16, int(config['price_accuracy'])), help="Validate voucher entry twice before posting it, if transection amount more then entered here"),
'max_amount': fields.float('Verify Transaction', digits=(16, int(config['price_accuracy'])), help="Validate voucher entry twice before posting it, if transection amount more then entered here"),
}
account_journal()

12
addons/account_voucher/voucher_view.xml
View File

@ -49,12 +49,16 @@
<separator string="Narration" colspan="4"/>
<field name="narration" colspan="4" nolabel="1" height="50"/>
<group col="6" colspan="6">
<group col="2" colspan="2">
<field name="state"/>
<button name="open_voucher" string="Pro-forma" states="draft"/>
<button name="proforma_voucher" string="Create" states="proforma"/>
</group>
<group col="4" colspan="4">
<button name="open_voucher" string="Pro-forma" states="draft" icon="terp-check"/>
<button name="proforma_voucher" string="Create" states="proforma" icon="terp-document-new"/>
<button name="recheck_voucher" string="Validate" states="recheck"/>
<button name="cancel_voucher" string="Cancel" states="draft,proforma,recheck" type="object"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
<button name="cancel_voucher" string="Cancel" states="draft,proforma,recheck" type="object" icon="gtk-cancel"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
</group>
</group>
</page>
<page string="Other Info">

4
addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
View File

@ -30,7 +30,7 @@
<field name="target">new</field>
</record>
<record model="ir.values" id="hr_timesheet_invoice_cost_ledger_values">
<!-- <record model="ir.values" id="hr_timesheet_invoice_cost_ledger_values">
<field name="model_id" ref="model_account_analytic_account" />
<field name="object" eval="1" />
<field name="name">Cost Ledger</field>
@ -38,7 +38,7 @@
<field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_timesheet_invoice_cost_ledger'))" />
<field name="key">action</field>
<field name="model">account.analytic.account</field>
</record>
</record> -->
</data>
</openerp>