diff options
| author | psi (Open ERP) <psi@tinyerp.co.in> | 2010-05-28 15:56:01 +0530 |
|---|---|---|
| committer | psi (Open ERP) <psi@tinyerp.co.in> | 2010-05-28 15:56:01 +0530 |
| commit | df72e9b29d08f3d497a4fab8e0fb7df2e8cd3a8c (patch) | |
| tree | a54df5fa9e02e1f2ffebb4085ed24d643fc4c69f | |
| parent | 8eb8507424bcb72b2f03de95e78561e68c149be5 (diff) | |
| parent | d656c5bb0ba8e06cead91a15f62ff84e39052eec (diff) | |
[MERGE] merge with dev-addons3 branch
bzr revid: psi@tinyerp.co.in-20100528102601-6i93mta2q4kk4mod
39 files changed, 1076 insertions, 1293 deletions
diff --git a/addons/account/account.py b/addons/account/account.py index 852e8e483f7..3fb74401946 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -559,7 +559,7 @@ class account_journal(osv.osv): _columns = { 'name': fields.char('Journal Name', size=64, required=True, translate=True), 'code': fields.char('Code', size=16), - 'type': fields.selection([('sale', 'Sale'), ('purchase', 'Purchase'), ('cash', 'Cash'), ('general', 'General'), ('situation', 'Situation')], 'Type', size=32, required=True, + 'type': fields.selection([('sale', 'Sale'), ('purchase', 'Purchase'), ('expanse', 'Expanse'), ('cash', 'Cash'), ('bank', 'Bank'), ('general', 'General'), ('situation', 'Situation')], 'Type', size=32, required=True, help="Select 'Sale' for Sale journal to be used at the time of making invoice."\ " Select 'Purchase' for Purchase Journal to be used at the time of approving purchase order."\ " Select 'Cash' to be used at the time of making payment."\ @@ -927,7 +927,7 @@ class account_move(osv.osv): ('journal_sale_vou','Journal Sale'), ('journal_pur_voucher','Journal Purchase'), ('journal_voucher','Journal Voucher'), - ],'Type', readonly=True, select=True, states={'draft':[('readonly',False)]}), + ],'Entry Type', select=True , size=128, readonly=True, states={'draft':[('readonly',False)]}), 'narration':fields.text('Narration', readonly=True, select=True, states={'draft':[('readonly',False)]}), 'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company',store=True), } diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index a2d18095618..4cdcb7787b6 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -22,7 +22,7 @@ groups="group_account_user"/> <menuitem id="menu_account_end_year_treatments" name="End of Year Treatments" parent="account.menu_finance_periodical_processing" sequence="20"/> - <menuitem id="menu_finance_statastic_report_statement" name="Satistic Reports" parent="account.menu_finance_reporting" sequence="3"/> + <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="account.menu_finance_reporting" sequence="3"/> </data> </openerp> diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index a5591cb3252..64811758701 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -135,8 +135,10 @@ <field name="check_history"/> <field name="type" select="1"/> <newline/> - <field colspan="4" name="tax_ids" domain="[('parent_id','=',False)]"/> - <field name="child_consol_ids" colspan="4" attrs="{'readonly':[('type','!=','consolidation')]}"/> + <separator string="Default Taxes" colspan="4"/> + <field colspan="4" name="tax_ids" nolabel="1" domain="[('parent_id','=',False)]"/> + <separator string="Consolidated Children" colspan="4"/> + <field name="child_consol_ids" colspan="4" nolabel="1" attrs="{'readonly':[('type','!=','consolidation')]}"/> </page> <page string="Notes"> <field colspan="4" name="note" nolabel="1"/> @@ -146,7 +148,7 @@ </field> </record> - <record id="view_account_search" model="ir.ui.view"> + <record id="view_account_search" model="ir.ui.view"> <field name="name">account.account.search</field> <field name="model">account.account</field> <field name="type">search</field> @@ -1116,8 +1118,8 @@ <!-- bank reconsilation --> <menuitem action="action_account_bank_reconcile_tree" - id="menu_action_account_bank_reconcile_check_tree" - parent="account.next_id_30" /> + id="menu_action_account_bank_reconcile_check_tree" + parent="account.next_id_30" /> <act_window diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py index 0afffa24417..482b9b62280 100644 --- a/addons/account/report/__init__.py +++ b/addons/account/report/__init__.py @@ -30,7 +30,6 @@ import invoice import overdue import aged_trial_balance import tax_report -import general_ledger_landscape import account_tax_code import account_balance_landscape import compare_account_balance diff --git a/addons/account/report/account_account_report_view.xml b/addons/account/report/account_account_report_view.xml index f2d6338c951..137fa0c69ae 100644 --- a/addons/account/report/account_account_report_view.xml +++ b/addons/account/report/account_account_report_view.xml @@ -6,7 +6,7 @@ <field name="model">account.account.report</field> <field name="type">tree</field> <field name="arch" type="xml"> - <tree string="Account Report"> + <tree string="Accounts Analysis"> <field name="name" invisible="1" string="Account"/> <field name="code" invisible="1"/> <field name="type" invisible="1"/> @@ -29,7 +29,7 @@ <field name="model">account.account.report</field> <field name="type">graph</field> <field name="arch" type="xml"> - <graph string="Accounts" type="bar"> + <graph string="Accounts Analysis" type="bar"> <field name="name"/> <field name="credit" operator="+"/> <field name="debit" operator="+"/> @@ -43,7 +43,7 @@ <field name="model">account.account.report</field> <field name="type">search</field> <field name="arch" type="xml"> - <search string="Accounts"> + <search string="Accounts Analysis"> <group> <filter icon="terp-account" string="At Date" @@ -54,7 +54,6 @@ <separator orientation="vertical"/> <field name="name" string="Account"/> <field name="code"/> - <field name="company_id" widget="selection" groups="base.group_multi_company"/> </group> <newline/> <group expand="1" string="Group By..."> @@ -69,9 +68,11 @@ </group> <newline/> <group expand="0" string="Extended options..." groups="base.group_extended"> + <field name="parent_account_id" /> + <separator orientation="vertical"/> <field name="type" /> <field name="user_type" widget="selection"/> - <field name="parent_account_id" /> + <field name="company_id" widget="selection" groups="base.group_multi_company"/> </group> </search> @@ -79,7 +80,7 @@ </record> <record id="action_account_account_report" model="ir.actions.act_window"> - <field name="name">Accounts</field> + <field name="name">Accounts Analysis</field> <field name="res_model">account.account.report</field> <field name="view_type">form</field> <field name="view_mode">tree,graph</field> @@ -87,7 +88,7 @@ <field name="search_view_id" ref="view_account_account_report_search"/> </record> - <menuitem action="action_account_account_report" id="menu_action_account_account_report" parent="account.menu_finance_statastic_report_statement" sequence="6"/> + <menuitem action="action_account_account_report" id="menu_action_account_account_report" parent="account.menu_finance_statistic_report_statement" sequence="6"/> </data> </openerp> diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml index e1cd7967b8d..157a08f8ca5 100644 --- a/addons/account/report/account_analytic_entries_report_view.xml +++ b/addons/account/report/account_analytic_entries_report_view.xml @@ -6,14 +6,14 @@ <field name="model">analytic.entries.report</field> <field name="type">tree</field> <field name="arch" type="xml"> - <tree string="Analytic Entries Statistics"> + <tree string="Analytic Entries Analysis"> <field name="date" invisible="1"/> <field name="year" invisible="1"/> <field name="day" invisible="1"/> <field name="month" invisible="1"/> <field name="user_id" invisible="1"/> <field name="name" invisible="1"/> - <field name="company_id" invisible="1" groups="base.multi_company"/> + <field name="company_id" invisible="1" groups="base.group_multi_company"/> <field name="currency_id" invisible="1"/> <field name="account_id" invisible="1"/> <field name="general_account_id" invisible="1"/> @@ -33,32 +33,31 @@ <field name="model">analytic.entries.report</field> <field name="type">search</field> <field name="arch" type="xml"> - <search string="Analytic Entries"> + <search string="Analytic Entries Analysis"> <group col="10" colspan="12"> - <filter icon="terp-account" string="Last 365 DAys" + <filter icon="gtk-media-rewind" string="Last 365 Days" domain="[('day','<=', time.strftime('%%Y-%%m-%%d')),('day','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" - help="Analytic Entries of the year"/> - <filter icon="terp-account" string="Last 30 Days" + help="Analytic Entries of last 365 days"/> + <filter icon="gtk-media-rewind" string="Last 30 Days" name="month" domain="[('day','<=', time.strftime('%%Y-%%m-%%d')), ('day','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" - help="Analytic Entries of this month"/> + help="Analytic Entries of last 30 days"/> <filter icon="gtk-media-rewind" string=" 7 Days " separator="1" domain="[('day','<=', time.strftime('%%Y-%%m-%%d')), ('day','>',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" help="Analytic Entries during last 7 days"/> <separator orientation="vertical"/> - <field name="name"/> + <field name="product_id" /> <field name="user_id" widget="selection"> - <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Case"/> + <filter icon="terp-account" domain="[('user_id','=',uid)]" help="My Entries"/> </field> - <field name="currency_id"/> </group> <newline/> <group expand="1" string="Group By..."> <filter string="User" name="User" icon="terp-account" context="{'group_by':'user_id'}"/> <filter string="Currency" icon="terp-account" context="{'group_by':'currency_id'}"/> - <filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.multi_company"/> + <filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <separator orientation="vertical"/> <filter string="Account" icon="terp-account" context="{'group_by':'account_id'}"/> <filter string="General Account" icon="terp-account" context="{'group_by':'general_account_id'}"/> @@ -73,15 +72,15 @@ </group> <newline/> <group expand="0" string="Extended options..." groups="base.group_extended"> - <field name="account_id" /> + <field name="currency_id" widget="selection"/> <field name="general_account_id" widget="selection"/> + <field name="product_uom_id" widget="selection"/> <field name="journal_id" widget="selection"/> <separator orientation="vertical"/> - <field name="product_id" /> - <field name="product_uom_id" widget="selection"/> - <field name="company_id" widget="selection" groups="base.multi_company"/> + <field name="name"/> + <field name="account_id"/> + <field name="company_id" widget="selection" groups="base.group_multi_company"/> </group> - </search> </field> </record> @@ -90,7 +89,7 @@ <field name="model">analytic.entries.report</field> <field name="type">graph</field> <field name="arch" type="xml"> - <graph string="Analytic Entries" type="bar"> + <graph string="Analytic Entries Analysis" type="bar"> <field name="user_id"/> <field name="amount" operator="+"/> <field name="unit_amount" operator="+"/> @@ -99,7 +98,7 @@ </field> </record> <record id="action_analytic_entries_report" model="ir.actions.act_window"> - <field name="name">Analytic Entries</field> + <field name="name">Analytic Entries Analysis</field> <field name="res_model">analytic.entries.report</field> <field name="view_type">form</field> <field name="view_mode">tree,graph</field> @@ -107,7 +106,7 @@ <field name="search_view_id" ref="view_analytic_entries_report_search"/> </record> - <menuitem action="action_analytic_entries_report" id="menu_action_analytic_entries_report" parent="account.menu_finance_statastic_report_statement" sequence="4"/> + <menuitem action="action_analytic_entries_report" id="menu_action_analytic_entries_report" parent="account.menu_finance_statistic_report_statement" sequence="4"/> </data> </openerp> diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml index 9a60b8a7bd0..eba69e2785b 100644 --- a/addons/account/report/account_analytic_report_view.xml +++ b/addons/account/report/account_analytic_report_view.xml @@ -6,7 +6,7 @@ <field name="model">analytic.report</field> <field name="type">tree</field> <field name="arch" type="xml"> - <tree string="Analytic Accounts Statistics"> + <tree string="Analytic Accounts Analysis"> <field name="parent_id" invisible="1" string="Analytic Account"/> <field name="product_id" invisible="1"/> <field name="name" invisible="1"/> @@ -19,9 +19,9 @@ <field name="nbr" sum ="# of Lines"/> <field name="company_id" invisible="1" groups="base.group_multi_company"/> <field name="type" invisible="1"/> - <field name="debit"/> - <field name="credit"/> - <field name="balance"/> + <field name="debit" sum ="Debit"/> + <field name="credit" sum ="Credit"/> + <field name="balance" sum ="Balance"/> <field name="state" invisible="1"/> <field name="day" invisible="1"/> <field name="month" invisible="1"/> @@ -34,20 +34,20 @@ <field name="model">analytic.report</field> <field name="type">search</field> <field name="arch" type="xml"> - <search string="Analytic Accounts"> + <search string="Analytic Accounts Analysis"> <group> - <filter icon="terp-account" - string="This Year" - domain="[('year','=',time.strftime('%%Y'))]"/> - <filter icon="terp-account" - string="This Month" - name="This Month" - domain="[('month','=',time.strftime('%%m'))]"/> - <filter icon="gtk-media-rewind" - string=" 7 Days " - separator="1" - domain="[('day','<=', time.strftime('%%Y-%%m-%%d')), ('day','>',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" - help="Entries during last 7 days"/> + <filter icon="gtk-media-rewind" string="Last 365 Days" + domain="[('day','<=', time.strftime('%%Y-%%m-%%d')),('day','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" + help="Analytic Accounts of last 365 days"/> + <filter icon="gtk-media-rewind" string="Last 30 Days" + name="This Month" + domain="[('day','<=', time.strftime('%%Y-%%m-%%d')), ('day','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" + help="Analytic Accounts of last 30 days"/> + <filter icon="gtk-media-rewind" + string=" 7 Days " + separator="1" + domain="[('day','<=', time.strftime('%%Y-%%m-%%d')), ('day','>',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" + help="Analytic Accounts during last 7 days"/> <separator orientation="vertical"/> <filter icon="terp-account" string="Draft" @@ -60,13 +60,14 @@ domain="[('state','=','pending')]"/> <separator orientation="vertical"/> <field name="name"/> + <field name="product_id" /> + <field name="partner_id"/> <field name="user_id" widget="selection"> <filter icon="terp-account" string="My Accounts" help="My Account" domain="[('user_id','=',uid)]"/> </field> - <field name="partner_id"/> </group> <newline/> <group expand="1" string="Group By..." colspan="10" col="12"> @@ -85,34 +86,16 @@ <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/> <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/> </group> - <newline/> <group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended"> - <filter icon="terp-account" - string="Draft" - domain="[('state','=','draft')]"/> - <filter icon="terp-account" - string="Open" - domain="[('state','=','open')]"/> - <filter icon="terp-account" - string="Pending" - domain="[('state','=','pending')]"/> - <filter icon="terp-account" - string="Close" - domain="[('state','=','close')]"/> - <filter icon="terp-account" - string="Template" - domain="[('state','=','template')]"/> + <field name="date_start"/> + <field name="date_end"/> <separator orientation="vertical"/> - <field name="company_id" widget="selection" groups="base.group_multi_company"/> + <field name="state"/> <field name="parent_id"/> <field name="journal_id" widget="selection"/> - <newline/> - <field name="product_id" /> <field name="type"/> - <separator orientation="vertical"/> - <field name="date_start"/> - <field name="date_end"/> + <field name="company_id" widget="selection" groups="base.group_multi_company"/> </group> </search> </field> @@ -122,7 +105,7 @@ <field name="model">analytic.report</field> <field name="type">graph</field> <field name="arch" type="xml"> - <graph string="Analytic Accounts" type="bar"> + <graph string="Analytic Accounts Analysis" type="bar"> <field name="user_id"/> <field name="credit" operator="+"/> <field name="debit" operator="+"/> @@ -132,14 +115,14 @@ </field> </record> <record id="action_analytic_report_all" model="ir.actions.act_window"> - <field name="name">Analytic Accounts</field> + <field name="name">Analytic Accounts Analysis</field> <field name="res_model">analytic.report</field> <field name="view_type">form</field> <field name="view_mode">tree,graph</field> <field name="context">{'search_default_This Month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field> <field name="search_view_id" ref="view_analytic_report_search"/> </record> - <menuitem action="action_analytic_report_all" id="menu_action_analytic_report_all" parent="account.menu_finance_statastic_report_statement" sequence="8"/> + <menuitem action="action_analytic_report_all" id="menu_action_analytic_report_all" parent="account.menu_finance_statistic_report_statement" sequence="8"/> </data> </openerp> diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index 625d98fa9cb..f61348c290c 100644 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -6,7 +6,7 @@ <field name="model">account.entries.report</field> <field name="type">tree</field> <field name="arch" type="xml"> - <tree string="Invoices Statistics"> + <tree string="Entries Analysis"> <field name="date" invisible="1"/> <field name="date_created" invisible="1"/> <field name="date_maturity" invisible="1"/> @@ -37,7 +37,7 @@ <field name="model">account.entries.report</field> <field name="type">graph</field> <field name="arch" type="xml"> - <graph string="Entries" type="bar"> + <graph string="Entries Analysis" type="bar"> <field name="partner_id"/> <field name="amount"/> </graph> @@ -48,15 +48,15 @@ <field name="model">account.entries.report</field> <field name="type">search</field> <field name="arch" type="xml"> - <search string="Entries"> + <search string="Entries Analysis"> <group colspan="10" col="12"> - <filter icon="terp-account" string="This Year" + <filter icon="gtk-media-rewind" string="Last 365 Days" domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" - help="Entries of the year"/> - <filter icon="terp-account" string="This Month" + help="Entries of last 365 days"/> + <filter icon="gtk-media-rewind" string="Last 30 Days" name="This Month" domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" - help="Entries of this month"/> + help="Entries of last 30 days"/> <filter icon="gtk-media-rewind" string=" 7 Days " separator="1" @@ -66,62 +66,61 @@ <filter string="Draft" icon="terp-account" domain="[('state','=','draft')]" - help = "Draft tasks"/> + help = "Draft entries"/> + <filter string="Posted" + icon="terp-account" + domain="[('state','=','posted')]" + help = "Posted entries"/> <separator orientation="vertical"/> - <field name="journal_id" widget="selection"/> - <field name="account_id"/> - <field name="company_id" widget="selection" groups="base.group_multi_company"/> - <field name="partner_id" /> + <field name="product_id" /> + <field name="partner_id" /> + <field name="account_id"/> + <field name="analytic_account_id"/> </group> <newline/> - <group expand="1" string="Group By..." colspan="10" col="12"> - <filter string="Journal" name="Journal" icon="terp-account" context="{'group_by':'journal_id'}"/> - <filter string="Account" name="Account" icon="terp-account" context="{'group_by':'account_id'}"/> - <filter string="Analytic Account" name="Analytic Account" icon="terp-account" context="{'group_by':'analytic_account_id'}"/> - <filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> + <group expand="1" string="Group By..."> <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/> <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/> + <filter string="Journal" name="Journal" icon="terp-account" context="{'group_by':'journal_id'}"/> <separator orientation="vertical"/> <filter string="State" icon="terp-account" context="{'group_by':'state'}"/> + <filter string="Type" icon="terp-account" context="{'group_by':'type'}"/> + <filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> + <filter string="Account" name="Account" icon="terp-account" context="{'group_by':'account_id'}"/> + <separator orientation="vertical"/> + <filter string="Analytic Account" name="Analytic Account" icon="terp-account" context="{'group_by':'analytic_account_id'}"/> <filter string="State of Move Line" icon="terp-account" context="{'group_by':'state_2'}"/> <filter string="Period" icon="terp-account" context="{'group_by':'period_id'}"/> <filter string="Period of Move Line" icon="terp-account" context="{'group_by':'period_id2'}"/> - <filter string="Type" icon="terp-account" context="{'group_by':'type'}"/> - <separator orientation="vertical"/> + <newline/> <filter string="Day" icon="terp-account" context="{'group_by':'day'}"/> <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/> <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/> </group> - <group expand="0" string="Extended options..." colspan="10" col="12"> - <filter string="Posted" - icon="terp-account" - domain="[('state','=','posted')]" - help = "Posted tasks"/> - <field name="state_2"/> - <separator orientation="vertical"/> - <field name="period_id" widget="selection"/> - <field name="period_id2" widget="selection"/> - <field name="type"/> - <field name="product_id" /> - <field name="analytic_account_id"/> + <newline/> + <group expand="0" string="Extended options..." groups="base.group_extended"> + <field name="state_2"/> + <field name="period_id" widget="selection"/> + <field name="period_id2" widget="selection"/> + <field name="type"/> + <field name="journal_id" widget="selection"/> + <field name="company_id" widget="selection" groups="base.group_multi_company"/> <newline/> - <separator orientation="vertical"/> <field name="date_created"/> - <field name="date"/> + <field name="date"/> <field name="date_maturity"/> - </group> - + </group> </search> </field> </record> <record id="action_account_entries_report_all" model="ir.actions.act_window"> - <field name="name">Entries</field> + <field name="name">Entries Analysis</field> <field name="res_model">account.entries.report</field> <field name="view_type">form</field> <field name="view_mode">tree,graph</field> <field name="context">{'search_default_This Month':1,'search_default_Journal':1,'group_by_no_leaf':1,'group_by':[]}</field> <field name="search_view_id" ref="view_account_entries_report_search"/> </record> - <menuitem action="action_account_entries_report_all" id="menu_action_account_entries_report_all" parent="account.menu_finance_statastic_report_statement" sequence="2"/> + <menuitem action="action_account_entries_report_all" id="menu_action_account_entries_report_all" parent="account.menu_finance_statistic_report_statement" sequence="2"/> </data> </openerp> diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index ae00608b164..597e5f43675 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -6,7 +6,7 @@ <field name="model">account.invoice.report</field> <field name="type">tree</field> <field name="arch" type="xml"> - <tree string="Invoices Statistics"> + <tree string="Invoices Analysis"> <field name="date" invisible="1"/> <field name="user_id" invisible="1"/> <field name="year" invisible="1"/> @@ -21,9 +21,7 @@ <field name="price_average" avg="Average Price"/> <field name="price_total" sum="Total Price"/> <field name="state" invisible="1"/> - <field name="payment_term" invisible="1"/> <field name="period_id" invisible="1"/> - <field name="fiscal_position" invisible="1"/> <field name="currency_id" invisible="1"/> <field name="journal_id" invisible="1"/> <field name="date_due" invisible="1"/> @@ -42,7 +40,7 @@ <field name="model">account.invoice.report</field> <field name="type">graph</field> <field name="arch" type="xml"> - <graph string="Invoices Statistics" type="bar"> + <graph string="Invoices Analysis" type="bar"> <field name="product_id"/> <field name="price_total"/> </graph> @@ -54,7 +52,7 @@ <field name="model">account.invoice.report</field> <field name="type">search</field> <field name="arch" type="xml"> - <search string="Invoices"> + <search string="Invoices Analysis"> <group col="10" colspan="12"> <filter icon="gtk-media-rewind" string="Last 365 Days" domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" @@ -72,27 +70,28 @@ <filter string="Draft" icon="terp-account" domain="[('state','=','draft')]" - help = "Draft tasks"/> + help = "Draft Invoices"/> <filter string="Pro-forma" icon="terp-account" domain="[('state','=','proforma'),('state','=','proforma2')]" - help = "Pro-forma tasks"/> + help = "Pro-forma Invoices"/> <filter string="Current" icon="terp-account" domain="[('state', '=' ,'open')]" - help = "In progress tasks"/> + help = "open Invoices"/> <filter string="Done" icon="terp-account" domain="[('state','=','paid')]" - help = "Done tasks"/> + help = "Done Invoices"/> <separator orientation="vertical"/> <field name="partner_id"/> <field name="user_id" widget="selection"> <filter icon="terp-account" - string="Invoices Non Users" - help="Invoices Non Users" - domain="[('user_id','=',False)]"/> + string="My Invoices" + help="My Invoices" + domain="[('user_id','=',uid)]"/> </field> + <field name="company_id" groups="base.group_multi_company" widget="selection"/> </group> <newline/> <group expand="1" string="Group By..."> @@ -109,9 +108,7 @@ <filter string="Bank Account" icon="terp-account" context="{'group_by':'partner_bank'}"/> <separator orientation="vertical"/> <filter string="Currency" icon="terp-account" context="{'group_by':'currency_id'}"/> - <filter string="Payment Term" icon="terp-account" context="{'group_by':'payment_term'}"/> <filter string="Force Period" icon="terp-account" context="{'group_by':'period_id'}"/> - <filter string="Fiscal Position" icon="terp-account" context="{'group_by':'fiscal_position'}"/> <newline/> <filter string="Day" icon="terp-account" context="{'group_by':'day'}"/> <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/> @@ -119,39 +116,39 @@ </group> <newline/> <group expand="0" string="Extended options..." groups="base.group_extended"> + + <field name="date" string="Date Invoiced"/> + <separator orientation="vertical"/> <field name="type"/> <field name="currency_id" widget="selection"/> <field name="partner_bank" widget="selection"/> - <field name="fiscal_position" widget="selection"/> <separator orientation="vertical"/> <field name="address_contact_id"/> <field name="account_id"/> <newline/> - <field name="payment_term" widget="selection"/> + <field name="date_due"/> + <separator orientation="vertical"/> <field name="journal_id" widget="selection"/> <field name="period_id" widget="selection"/> - <field name="company_id" groups="base.group_multi_company" widget="selection"/> + <field name="state"/> <separator orientation="vertical"/> <field name="address_invoice_id"/> <field name="product_id"/> - <newline/> - <field name="date" string="Date Invoiced"/> - <field name="date_due"/> </group> </search> </field> </record> <record id="action_account_invoice_report_all" model="ir.actions.act_window"> - <field name="name">Invoices</field> + <field name="name">Invoices Analysis</field> <field name="res_model">account.invoice.report</field> <field name="view_type">form</field> <field name="view_mode">tree,graph</field> - <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[],'search_default_user_id':uid}</field> + <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field> <field name="search_view_id" ref="view_account_invoice_report_search"/> </record> - <menuitem action="action_account_invoice_report_all" id="menu_action_account_invoice_report_all" parent="account.menu_finance_statastic_report_statement" sequence="0"/> + <menuitem action="action_account_invoice_report_all" id="menu_action_account_invoice_report_all" parent="account.menu_finance_statistic_report_statement" sequence="0"/> </data> </openerp> diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py index 00031a77ed8..e2c24fe96d2 100644 --- a/addons/account/report/general_ledger.py +++ b/addons/account/report/general_ledger.py @@ -33,8 +33,6 @@ import pooler class general_ledger(rml_parse.rml_parse): _name = 'report.account.general.ledger' - - def set_context(self, objects, data, ids, report_type = None): ## self.borne_date = self.get_min_date(data['form']) @@ -42,6 +40,7 @@ class general_ledger(rml_parse.rml_parse): new_ids = [] if (data['model'] == 'account.account'): new_ids = 'active_ids' in data['form']['context'] and data['form']['context']['active_ids'] or [] + #new_ids = ids else: new_ids.append(data['form']['Account_list']) @@ -70,39 +69,6 @@ class general_ledger(rml_parse.rml_parse): 'sum_currency_amount_account': self._sum_currency_amount_account }) self.context = context - def _calc_contrepartie(self,cr,uid,ids, context={}): - result = {} - #for id in ids: - # result.setdefault(id, False) - - for account_line in self.pool.get('account.move.line').browse(cr, uid, ids, context): - # For avoid long text in the field we will limit it to 5 lines - # - # - # - result[account_line.id] = ' ' - num_id_move = str(account_line.move_id.id) - num_id_line = str(account_line.id) - account_id = str(account_line.account_id.id) - # search the basic account - # We have the account ID we will search all account move line from now until this time - # We are in the case of we are on the top of the account move Line - cr.execute('SELECT distinct(ac.code) as code_rest,ac.name as name_rest from account_account AS ac, account_move_line mv\ - where ac.id = mv.account_id and mv.move_id = %s and mv.account_id <> %s' ,(num_id_move,account_id,)) - res_mv = cr.dictfetchall() - # we need a result more than 2 line to make the test so we will made the the on 1 because we have exclude the current line - if (len(res_mv) >=1): - concat = '' - rup_id = 0 - for move_rest in res_mv: - concat = concat + move_rest['code_rest'] + '|' - result[account_line.id] = concat - if rup_id >5: - # we need to stop the computing and to escape but before we will add "..." - result[account_line.id] = concat + '...' - break - rup_id+=1 - return result def get_min_date(self,form): @@ -118,12 +84,17 @@ class general_ledger(rml_parse.rml_parse): if form['state'] == 'byperiod': ## This function will return the most aged date periods = form['periods'] + #periods = form['periods'][0][2] if not periods: - self.cr.execute(""" - Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = %s""",(form['fiscalyear'],)) + sql = """ + Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = """ + str(form['fiscalyear']) + """ + """ else: - self.cr.execute(""" - Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id =ANY(%s)""",(periods,)) + periods_id = ','.join(map(str, periods)) + sql = """ + Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id in ( """ + periods_id + """) + """ + self.cr.execute(sql) res = self.cr.dictfetchall() borne_min = res[0]['start_date'] borne_max = res[0]['stop_date'] @@ -132,15 +103,17 @@ class general_ledger(rml_parse.rml_parse): borne_max = form['date_to'] elif form['state'] == 'all': periods = form['periods'] + #periods = form['periods'][0][2] if not periods: - if form['fiscalyear'] == False: - fiscalyears = self.pool.get('account.fiscalyear').search(self.cr, self.uid, [('state', '=', 'draft')]) - else: - fiscalyears = [form['fiscalyear']] - self.cr.execute("select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id =ANY(%s)" ,(fiscalyears,)) + sql = """ + Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = """ + str(form['fiscalyear']) + """ + """ else: - self.cr.execute(""" - Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id =ANY(%s)""",(periods,)) + periods_id = ','.join(map(str, periods)) + sql = """ + Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id in ( """ + periods_id + """) + """ + self.cr.execute(sql) res = self.cr.dictfetchall() period_min = res[0]['start_date'] period_max = res[0]['stop_date'] @@ -167,9 +140,6 @@ class general_ledger(rml_parse.rml_parse): } return self.date_borne - - - def get_children_accounts(self, account, form): self.child_ids = self.pool.get('account.account').search(self.cr, self.uid, @@ -184,6 +154,8 @@ class general_ledger(rml_parse.rml_parse): if form.has_key('fiscalyear'): ctx['fiscalyear'] = form['fiscalyear'] ctx['periods'] = form['periods'] + #ctx['periods'] = form['periods'][0][2] + else: ctx['date_from'] = form['date_from'] ctx['date_to'] = form['date_to'] @@ -224,8 +196,8 @@ class general_ledger(rml_parse.rml_parse): else: ## We will now compute solde initiaux for move in res: - self.cr.execute("""SELECT sum(l.debit) AS sum_debit, sum(l.credit) AS sum_credit FROM account_move_line l \ - WHERE l.account_id = %s AND l.date < %s AND l.date > %s""",(move.id,self.borne_date['max_date'],self.borne_date['min_date'])) + SOLDEINIT = "SELECT sum(l.debit) AS sum_debit, sum(l.credit) AS sum_credit FROM account_move_line l WHERE l.account_id = " + str(move.id) + " AND l.date < '" + self.borne_date['max_date'] + "'" + " AND l.date > '" + self.borne_date['min_date'] + "'" + self.cr.execute(SOLDEINIT) resultat = self.cr.dictfetchall() if resultat[0] : if resultat[0]['sum_debit'] == None: @@ -248,56 +220,60 @@ class general_ledger(rml_parse.rml_parse): return res def lines(self, account, form): - inv_types = { - 'out_invoice': 'CI: ', - 'in_invoice': 'SI: ', - 'out_refund': 'OR: ', - 'in_refund': 'SR: ', - } + """ Return all the account_move_line of account with their account code counterparts """ + # First compute all counterpart strings for every move_id where this account appear + sql = """ + SELECT m1.move_id, + array_to_string(ARRAY(SELECT DISTINCT a.code FROM account_move_line m2 LEFT JOIN account_account a ON (m2.account_id=a.id) WHERE m2.move_id = m1.move_id AND m2.account_id<>%%s), ', ') AS counterpart + FROM (SELECT move_id FROM account_move_line l WHERE %s AND l.account_id = %%s AND l.date<=%%s AND l.date>=%%s GROUP BY move_id) m1 + """ % self.query + self.cr.execute(sql, (account.id, account.id, self.date_borne['max_date'], self.date_borne['min_date'])) + counterpart_res = self.cr.dictfetchall() + counterpart_accounts = {} + for i in counterpart_res: + counterpart_accounts[i['move_id']]=i['counterpart'] + del counterpart_res + + # Then select all account_move_line of this account if form['sortbydate'] == 'sort_date': - sorttag = 'l.date' + sql_sort='l.date' else: - sorttag = 'j.code' + sql_sort='j.code' sql = """ - SELECT l.id, l.date, j.code,c.code AS currency_code,l.amount_currency,l.ref, l.name , COALESCE(l.debit,0) as debit, COALESCE(l.credit,0) as credit, l.period_id - FROM account_move_line as l - LEFT JOIN res_currency c on (l.currency_id=c.id) - JOIN account_journal j on (l.journal_id=j.id) - AND account_id = %%s - AND %s - WHERE l.date<=%%s - AND l.date>=%%s - ORDER by %s""" % (self.query, sorttag) - - self.cr.execute(sql, (account.id, self.date_borne['max_date'], self.date_borne['min_date'],)) - + SELECT l.id, l.date, j.code, l.amount_currency,l.ref, l.name, COALESCE(l.debit,0) AS debit, COALESCE(l.credit,0) AS credit, l.period_id, l.partner_id, + m.name AS move_name, m.id AS move_id, + c.code AS currency_code, + i.id AS invoice_id, i.type AS invoice_type, i.number AS invoice_number, + p.name AS partner_name + FROM account_move_line l + LEFT JOIN account_move m on (l.move_id=m.id) + LEFT JOIN res_currency c on (l.currency_id=c.id) + LEFT JOIN res_partner p on (l.partner_id=p.id) + LEFT JOIN account_invoice i on (m.id =i.move_id) + JOIN account_journal j on (l.journal_id=j.id) + WHERE %s AND l.account_id = %%s AND l.date<=%%s AND l.date>=%%s ORDER by %s + """ % (self.query, sql_sort) + self.cr.execute(sql, (account.id, self.date_borne['max_date'], self.date_borne['min_date'])) res = self.cr.dictfetchall() - sum = 0.0 + account_sum = 0.0 account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line') + inv_types = { 'out_invoice': 'CI', 'in_invoice': 'SI', 'out_refund': 'OR', 'in_refund': 'SR', } + for l in res: - line = self.pool.get('account.move.line').browse(self.cr, self.uid, l['id']) - l['move'] = line.move_id.name - self.cr.execute('Select id from account_invoice where move_id =%s',(line.move_id.id,)) - tmpres = self.cr.dictfetchall() - if len(tmpres) > 0 : - inv = self.pool.get('account.invoice').browse(self.cr, self.uid, tmpres[0]['id']) - l['ref'] = inv_types[inv.type] + ': '+str(inv.number) - if line.partner_id : - l['partner'] = line.partner_id.name - else : - l['partner'] = '' - sum = l['debit'] - l ['credit'] -# c = time.strptime(l['date'],"%Y-%m-%d") -# l['date'] = time.strftime("%d-%m-%Y",c) - l['progress'] = sum - l['line_corresp'] = self._calc_contrepartie(self.cr,self.uid,[l['id']])[l['id']] + l['move']=l['move_name'] + if l['invoice_id']: + l['ref'] = '%s: %s'%(inv_types[l['invoice_type']],l['invoice_number']) + l['partner'] = l['partner_name'] or '' + account_sum = l['debit'] - l ['credit'] + #c = time.strptime(l['date'],"%Y-%m-%d") + #l['date'] = time.strftime("%d-%m-%Y",c) + l['progress'] = account_sum + l['line_corresp'] = counterpart_accounts[l['move_id']] # Modification du amount Currency - if (l['credit'] > 0): + if l['credit'] > 0: if l['amount_currency'] != None: l['amount_currency'] = abs(l['amount_currency']) * -1 - - # if l['amount_currency'] != None: self.tot_currency = self.tot_currency + l['amount_currency'] return res @@ -306,7 +282,7 @@ class general_ledger(rml_parse.rml_parse): self.cr.execute("SELECT sum(debit) "\ "FROM account_move_line l "\ - "WHERE l.account_id = %s AND "+self.query,(account.id,)) + "WHERE l.account_id = %s AND %s "%(account.id, self.query)) ## Add solde init to the result # sum_debit = self.cr.fetchone()[0] or 0.0 @@ -320,7 +296,7 @@ class general_ledger(rml_parse.rml_parse): self.cr.execute("SELECT sum(credit) "\ "FROM account_move_line l "\ - "WHERE l.account_id = %s AND "+ self.query,(account.id,)) + "WHERE l.account_id = %s AND %s "%(account.id,self.query)) ## Add solde init to the result # sum_credit = self.cr.fetchone()[0] or 0.0 @@ -334,7 +310,7 @@ class general_ledger(rml_parse.rml_parse): def _sum_solde_account(self, account, form): self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_solde "\ "FROM account_move_line l "\ - "WHERE l.account_id = %s AND "+ self.query,(account.id,)) + "WHERE l.account_id = %s AND %s"%(account.id,self.query)) sum_solde = self.cr.fetchone()[0] or 0.0 if form.get('soldeinit', False): sum_solde += account.init_debit - account.init_credit @@ -346,7 +322,7 @@ class general_ledger(rml_parse.rml_parse): return 0.0 self.cr.execute("SELECT sum(debit) "\ "FROM account_move_line l "\ - "WHERE l.account_id =ANY(%s) AND "+ self.query,(self.child_ids,)) + "WHERE l.account_id in ("+','.join(map(str, self.child_ids))+") AND "+self.query) sum_debit = self.cr.fetchone()[0] or 0.0 return sum_debit @@ -355,7 +331,7 @@ class general_ledger(rml_parse.rml_parse): return 0.0 self.cr.execute("SELECT sum(credit) "\ "FROM account_move_line l "\ - "WHERE l.account_id =ANY(%s) AND "+ self.query,(self.child_ids,)) + "WHERE l.account_id in ("+','.join(map(str, self.child_ids))+") AND "+self.query) ## Add solde init to the result # sum_credit = self.cr.fetchone()[0] or 0.0 @@ -366,14 +342,14 @@ class general_ledger(rml_parse.rml_parse): return 0.0 self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_solde "\ "FROM account_move_line l "\ - "WHERE l.account_id =ANY(%s) AND "+ self.query,(self.child_ids,)) + "WHERE l.account_id in ("+','.join(map(str, self.child_ids))+") AND "+self.query) sum_solde = self.cr.fetchone()[0] or 0.0 return sum_solde def _set_get_account_currency_code(self, account_id): self.cr.execute("SELECT c.code as code "\ "FROM res_currency c,account_account as ac "\ - "WHERE ac.id = %s AND ac.currency_id = c.id",(account_id,)) + "WHERE ac.id = %s AND ac.currency_id = c.id"%(account_id)) result = self.cr.fetchone() if result: self.account_currency = result[0] @@ -392,6 +368,7 @@ class general_ledger(rml_parse.rml_parse): currency_total = self.tot_currency = 0.0 return currency_total - report_sxw.report_sxw('report.account.general.ledger', 'account.account', 'addons/account/report/general_ledger.rml', parser=general_ledger, header=False) +report_sxw.report_sxw('report.account.general.ledger_landscape', 'account.account', 'addons/account/report/general_ledger_landscape.rml', parser=general_ledger, header=False) + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml index 75cb086b343..c69c981e35c 100644 --- a/addons/account/report/general_ledger.rml +++ b/addons/account/report/general_ledger.rml @@ -105,7 +105,7 @@ </blockTable> <section> <para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para> - <blockTable colWidths="66.0,124.0,70.0,40.0,80.0,59.0,52.0,54.0" style="tbl_content">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + <blockTable rowHeights="0.65cm" colWidths="66.0,124.0,70.0,40.0,80.0,59.0,52.0,54.0" style="tbl_content">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] <tr> <td> <blockTable colWidths="280.0,100.0,52.5,52.5,52.5" style="Table5"> @@ -156,7 +156,7 @@ </blockTable> <section> <para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para> - <blockTable colWidths="72.0,93.0,66.0,40.0,100.0,50.0,50.0,50.0,40.0" style="tbl_content">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + <blockTable rowHeights="0.65cm" colWidths="72.0,93.0,66.0,40.0,100.0,50.0,50.0,50.0,40.0" style="tbl_content">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] <tr> <td> <blockTable colWidths="264.00,100.0,50.0,50.0,49.0,40.00" style="Table5"> diff --git a/addons/account/report/general_ledger_landscape.py b/addons/account/report/general_ledger_landscape.py deleted file mode 100644 index 472f0675519..00000000000 --- a/addons/account/report/general_ledger_landscape.py +++ /dev/null @@ -1,396 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# Copyright (c) 2005-2006 CamptoCamp -# -# WARNING: This program as such is intended to be used by professional -# programmers who take the whole responsability of assessing all potential -# consequences resulting from its eventual inadequacies and bugs -# End users who are looking for a ready-to-use solution with commercial -# garantees and support are strongly adviced to contract a Free Software -# Service Company -# -# This program is Free Software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -############################################################################## - -import time -from report import report_sxw -import xml -import rml_parse -import pooler - -class general_ledger_landscape(rml_parse.rml_parse): - _name = 'report.account.general.ledger_landscape' - - - def set_context(self, objects, data, ids, report_type = None): - ## - self.borne_date = self.get_min_date(data['form']) - ## - new_ids = [] - if (data['model'] == 'account.account'): - new_ids = 'active_ids' in data['form']['context'] and data['form']['context']['active_ids'] or [] - else: - new_ids.append(data['form']['Account_list']) - objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids) - super(general_ledger_landscape, self).set_context(objects, data, new_ids,report_type) - - def __init__(self, cr, uid, name, context): - super(general_ledger_landscape, self).__init__(cr, uid, name, context=context) - self.date_borne = {} - self.query = "" - self.child_ids = "" - self.tot_currency = 0.0 - self.period_sql = "" - self.sold_accounts = {} - self.localcontext.update( { - 'time': time, - 'lines': self.lines, - 'sum_debit_account': self._sum_debit_account, - 'sum_credit_account': self._sum_credit_account, - 'sum_solde_account': self._sum_solde_account, - 'sum_debit': self._sum_debit, - 'sum_credit': self._sum_credit, - 'sum_solde': self._sum_solde, - 'get_children_accounts': self.get_children_accounts, - 'sum_currency_amount_account': self._sum_currency_amount_account - }) - self.context = context - def _calc_contrepartie(self,cr,uid,ids, context={}): - result = {} - #for id in ids: - # result.setdefault(id, False) - - for account_line in self.pool.get('account.move.line').browse(cr, uid, ids, context): - # For avoid long text in the field we will limit it to 5 lines - # - # - # - result[account_line.id] = ' ' - num_id_move = account_line.move_id.id - num_id_line = account_line.id - account_id = account_line.account_id.id - # search the basic account - # We have the account ID we will search all account move line from now until this time - # We are in the case of we are on the top of the account move Line - cr.execute('SELECT distinct(ac.code) as code_rest,ac.name as name_rest from account_account AS ac, account_move_line mv\ - where ac.id = mv.account_id and mv.move_id = %s and mv.account_id <> %s' , (num_id_move,account_id,)) - res_mv = cr.dictfetchall() - # we need a result more than 2 line to make the test so we will made the the on 1 because we have exclude the current line - if (len(res_mv) >=1): - concat = '' - rup_id = 0 - for move_rest in res_mv: - concat = concat + move_rest['code_rest'] + '|' - result[account_line.id] = concat - if rup_id >5: - # we need to stop the computing and to escape but before we will add "..." - result[account_line.id] = concat + '...' - break - rup_id+=1 - return result - - def get_min_date(self,form): - - ## Get max born from account_fiscal year - # - sql = """ select min(fy.date_start) as start_date,max(fy.date_stop) as stop_date from account_fiscalyear - As fy where fy.state <> 'close' - """ - self.cr.execute(sql) - res = self.cr.dictfetchall() - borne_min = res[0]['start_date'] - borne_max = res[0]['stop_date'] - if form['state'] == 'byperiod': - ## This function will return the most aged date - periods = form['periods'] - if not periods: - self.cr.execute(""" - Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = %s""" ,(form['fiscalyear'],)) - else: - self.cr.execute(""" - Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id =ANY(%s)""",(periods,)) - - res = self.cr.dictfetchall() - borne_min = res[0]['start_date'] - borne_max = res[0]['stop_date'] - elif form['state'] == 'bydate': - borne_min = form['date_from'] - borne_max = form['date_to'] - elif form['state'] == 'all': - periods = form['periods'] - if not periods: - if form['fiscalyear'] == False: - fiscalyears = self.pool.get('account.fiscalyear').search(self.cr, self.uid, [('state', '=', 'draft')]) - else: - fiscalyears = [form['fiscalyear']] - self.cr.execute("select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id =ANY(%s)" ,(fiscalyears,)) - else: - self.cr.execute(""" - Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id =ANY(%s)""",(periods,)) - res = self.cr.dictfetchall() - period_min = res[0]['start_date'] - period_max = res[0]['stop_date'] - date_min = form['date_from'] - date_max = form['date_to'] - if period_min<date_min: - borne_min = period_min - else : - borne_min = date_min - if date_max<period_max: - borne_max = period_max - else : - borne_max = date_max - elif form['state'] == 'none': - sql = """ - SELECT min(date) as start_date,max(date) as stop_date FROM account_move_line """ - self.cr.execute(sql) - res = self.cr.dictfetchall() - borne_min = res[0]['start_date'] - borne_max = res[0]['stop_date'] - self.date_borne = { - 'min_date': borne_min, - 'max_date': borne_max, - } - return self.date_borne - - - - - def get_children_accounts(self, account, form): - self.child_ids = self.pool.get('account.account').search(self.cr, self.uid, - [('parent_id', 'child_of', self.ids)]) -# - res = [] - ctx = self.context.copy() - ## We will make the test for period or date - ## We will now make the test - # - ctx['state'] = form['context'].get('state','all') - if form.has_key('fiscalyear'): - ctx['fiscalyear'] = form['fiscalyear'] - ctx['periods'] = form['periods'] - else: - ctx['date_from'] = form['date_from'] - ctx['date_to'] = form['date_to'] - ## - - # - self.query = self.pool.get('account.move.line')._query_get(self.cr, self.uid, context=ctx) - if account and account.child_consol_ids: # add ids of consolidated childs also of selected account - ctx['consolidate_childs'] = True - ctx['account_id'] = account.id - ids_acc = self.pool.get('account.account').search(self.cr, self.uid,[('parent_id', 'child_of', [account.id])], context=ctx) - for child_id in ids_acc: - child_account = self.pool.get('account.account').browse(self.cr, self.uid, child_id) - sold_account = self._sum_solde_account(child_account,form) - self.sold_accounts[child_account.id] = sold_account - if form['display_account'] == 'bal_mouvement': - if child_account.type != 'view' \ - and len(self.pool.get('account.move.line').search(self.cr, self.uid, - [('account_id','=',child_account.id)], - context=ctx)) <> 0 : - res.append(child_account) - elif form['display_account'] == 'bal_solde': - if child_account.type != 'view' \ - and len(self.pool.get('account.move.line').search(self.cr, self.uid, - [('account_id','=',child_account.id)], - context=ctx)) <> 0 : - if ( sold_account <> 0.0): - res.append(child_account) - else: - if child_account.type != 'view' \ - and len(self.pool.get('account.move.line').search(self.cr, self.uid, - [('account_id','>=',child_account.id)], - context=ctx)) <> 0 : - res.append(child_account) - ## - if not len(res): - - return [account] - else: - ## We will now compute solde initiaux - for move in res: - self.cr.execute("""SELECT sum(l.debit) AS sum_debit, sum(l.credit) AS sum_credit FROM account_move_line l \ - WHERE l.account_id = %s AND l.date < %s AND l.date > %s""",(move.id,self.borne_date['max_date'],self.borne_date['min_date'])) - resultat = self.cr.dictfetchall() - if resultat[0] : - if resultat[0]['sum_debit'] == None: - sum_debit = 0 - else: - sum_debit = resultat[0]['sum_debit'] - if resultat[0]['sum_credit'] == None: - sum_credit = 0 - else: - sum_credit = resultat[0]['sum_credit'] - - move.init_credit = sum_credit - move.init_debit = sum_debit - - else: - move.init_credit = 0 - move.init_debit = 0 - - - return res - - def lines(self, account, form): - inv_types = { - 'out_invoice': 'CI: ', - 'in_invoice': 'SI: ', - 'out_refund': 'OR: ', - 'in_refund': 'SR: ', - } - - if form['sortbydate'] == 'sort_date': - sorttag = 'l.date' - else: - sorttag = 'j.code' - sql = """ - SELECT l.id, l.date, j.code,c.code AS currency_code,l.amount_currency,l.ref, l.name , COALESCE(l.debit,0) as debit, COALESCE(l.credit,0) as credit, l.period_id - FROM account_move_line as l - LEFT JOIN res_currency c on (l.currency_id=c.id) - JOIN account_journal j on (l.journal_id=j.id) - AND account_id = %%s - AND %s - WHERE l.date<=%%s - AND l.date>=%%s - ORDER by %s""" % (self.query, sorttag) - - self.cr.execute(sql, (account.id, self.date_borne['max_date'], self.date_borne['min_date'],)) - - res = self.cr.dictfetchall() - sum = 0.0 - account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line') - for l in res: - line = self.pool.get('account.move.line').browse(self.cr, self.uid, l['id']) - l['move'] = line.move_id.name - self.cr.execute('Select id from account_invoice where move_id =%s',(line.move_id.id,)) - tmpres = self.cr.dictfetchall() - if len(tmpres) > 0 : - inv = self.pool.get('account.invoice').browse(self.cr, self.uid, tmpres[0]['id']) - l['ref'] = inv_types[inv.type] + ': '+str(inv.number) - if line.partner_id : - l['partner'] = line.partner_id.name - else : - l['partner'] = '' - sum = l['debit'] - l ['credit'] -# c = time.strptime(l['date'],"%Y-%m-%d") -# l['date'] = time.strftime("%d-%m-%Y",c) - l['progress'] = sum - l['line_corresp'] = self._calc_contrepartie(self.cr,self.uid,[l['id']])[l['id']] - # Modification du amount Currency - if (l['credit'] > 0): - if l['amount_currency'] != None: - l['amount_currency'] = abs(l['amount_currency']) * -1 - - # - if l['amount_currency'] != None: - self.tot_currency = self.tot_currency + l['amount_currency'] - return res - - def _sum_debit_account(self, account, form): - - self.cr.execute("SELECT sum(debit) "\ - "FROM account_move_line l "\ - "WHERE l.account_id = %s AND "+self.query,(account.id,)) - ## Add solde init to the result - # - sum_debit = self.cr.fetchone()[0] or 0.0 - if form['soldeinit']: - sum_debit += account.init_debit - # - ## - return sum_debit - - def _sum_credit_account(self, account, form): - - self.cr.execute("SELECT sum(credit) "\ - "FROM account_move_line l "\ - "WHERE l.account_id = %s AND "+self.query,(account.id,)) - ## Add solde init to the result - # - sum_credit = self.cr.fetchone()[0] or 0.0 - if form['soldeinit']: - sum_credit += account.init_credit - # - ## - - return sum_credit - - def _sum_solde_account(self, account, form): - self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_solde "\ - "FROM account_move_line l "\ - "WHERE l.account_id = %s AND "+self.query,(account.id,)) - sum_solde = self.cr.fetchone()[0] or 0.0 - if form.get('soldeinit',False): - sum_solde += account.init_debit - account.init_credit - - return sum_solde - - def _sum_debit(self, form): - if not self.ids: - return 0.0 - self.cr.execute("SELECT sum(debit) "\ - "FROM account_move_line l "\ - "WHERE l.account_id =ANY(%s) AND "+self.query,(self.child_ids,)) - sum_debit = self.cr.fetchone()[0] or 0.0 - return sum_debit - - def _sum_credit(self, form): - if not self.ids: - return 0.0 - self.cr.execute("SELECT sum(credit) "\ - "FROM account_move_line l "\ - "WHERE l.account_id =ANY(%s) AND "+self.query,(self.child_ids,)) - ## Add solde init to the result - # - sum_credit = self.cr.fetchone()[0] or 0.0 - return sum_credit - - def _sum_solde(self, form): - if not self.ids: - return 0.0 - self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_solde "\ - "FROM account_move_line l "\ - "WHERE l.account_id =ANY(%s) AND "+self.query,(self.child_ids,)) - sum_solde = self.cr.fetchone()[0] or 0.0 - return sum_solde - - def _set_get_account_currency_code(self, account_id): - self.cr.execute("SELECT c.code as code "\ - "FROM res_currency c,account_account as ac "\ - "WHERE ac.id = %s AND ac.currency_id = c.id",(account_id,)) - result = self.cr.fetchone() - if result: - self.account_currency = result[0] - else: - self.account_currency = False - - def _sum_currency_amount_account(self, account, form): - self._set_get_account_currency_code(account.id) - self.cr.execute("SELECT sum(aml.amount_currency) FROM account_move_line as aml,res_currency as rc WHERE aml.currency_id = rc.id AND aml.account_id= %s ", (account.id,)) - total = self.cr.fetchone() - - if self.account_currency: - return_field = str(total[0]) + self.account_currency - return return_field - else: - currency_total = self.tot_currency = 0.0 - return currency_total - -report_sxw.report_sxw('report.account.general.ledger_landscape', 'account.account', 'addons/account/report/general_ledger_landscape.rml', parser=general_ledger_landscape, header=False) -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml index 9e937a72baf..a707a47d0bd 100644 --- a/addons/account/report/general_ledger_landscape.rml +++ b/addons/account/report/general_ledger_landscape.rml @@ -104,7 +104,7 @@ <para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para> - <blockTable colWidths="66.0,35.0,150.0, 90.0,60.0,335.0,50.0,69.0,72.0,64.0,58.0" style="tbl_content">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + <blockTable rowHeights="0.65cm" colWidths="66.0,35.0,150.0, 90.0,60.0,335.0,50.0,69.0,72.0,64.0,58.0" style="tbl_content">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] <tr> <td> <blockTable colWidths="404.0,375.0,69.0,72.0,64.0,59.00" style="Table5"> @@ -165,7 +165,7 @@ <para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para> - <blockTable colWidths="66.0,35.0,166.0,90.0,60.0,378.0,50.0,69.0,72.0,64.0" style="tbl_content">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + <blockTable rowHeights="0.65cm" colWidths="66.0,35.0,166.0,90.0,60.0,378.0,50.0,69.0,72.0,64.0" style="tbl_content">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] <tr> <td> <blockTable colWidths="405.0,435.0,69.0,72.0,64.0" style="Table5"> diff --git a/addons/account/report/third_party_ledger.py b/addons/account/report/third_party_ledger.py index 1dca4dfb64a..c10fcb33313 100644 --- a/addons/account/report/third_party_ledger.py +++ b/addons/account/report/third_party_ledger.py @@ -167,9 +167,9 @@ class third_party_ledger(rml_parse.rml_parse): # #new_ids = [id for (id,) in self.cr.fetchall()] if data['form']['result_selection'] == 'supplier': - self.ACCOUNT_TYPE = ['receivable'] - elif data['form']['result_selection'] == 'customer': self.ACCOUNT_TYPE = ['payable'] + elif data['form']['result_selection'] == 'customer': + self.ACCOUNT_TYPE = ['receivable'] elif data['form']['result_selection'] == 'all': self.ACCOUNT_TYPE = ['payable','receivable'] diff --git a/addons/account_analytic_plans/i18n/id.po b/addons/account_analytic_plans/i18n/id.po index 778d68ecd7d..bb4edb18b29 100644 --- a/addons/account_analytic_plans/i18n/id.po +++ b/addons/account_analytic_plans/i18n/id.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-09 13:43+0000\n" -"Last-Translator: <>\n" +"PO-Revision-Date: 2010-05-28 02:33+0000\n" +"Last-Translator: Abdul Munif Hanafi <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n" +"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_plans @@ -41,7 +41,7 @@ msgstr "" #. module: account_analytic_plans #: wizard_field:wizard.crossovered.analytic,init,date2:0 msgid "End Date" -msgstr "" +msgstr "Tanggal Akhir" #. module: account_analytic_plans #: field:account.analytic.plan.instance.line,rate:0 @@ -70,7 +70,7 @@ msgstr "" #. module: account_analytic_plans #: wizard_button:wizard.crossovered.analytic,init,print:0 msgid "Print" -msgstr "" +msgstr "Cetak" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 @@ -90,7 +90,7 @@ msgstr "" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 msgid "Account Name" -msgstr "" +msgstr "Nama Akun" #. module: account_analytic_plans #: view:account.analytic.plan.instance.line:0 @@ -100,7 +100,7 @@ msgstr "" #. module: account_analytic_plans #: field:account.analytic.plan.instance,code:0 msgid "Distribution Code" -msgstr "" +msgstr "Kode Distribusi" #. module: account_analytic_plans #: constraint:ir.actions.act_window:0 @@ -115,17 +115,17 @@ msgstr "" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 msgid "Printing date" -msgstr "" +msgstr "Tanggal mencetak" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 msgid "Percentage" -msgstr "" +msgstr "Persentase" #. module: account_analytic_plans #: wizard_field:wizard.crossovered.analytic,init,empty_line:0 msgid "Dont show empty lines" -msgstr "" +msgstr "Jangan tampilkan baris kosong" #. module: account_analytic_plans #: wizard_view:wizard.crossovered.analytic,init:0 @@ -141,12 +141,12 @@ msgstr "" #: field:account.analytic.plan.instance,journal_id:0 #: wizard_field:wizard.crossovered.analytic,init,journal_ids:0 msgid "Analytic Journal" -msgstr "" +msgstr "Jurnal Analisis" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 msgid "100.00%" -msgstr "" +msgstr "100.00%" #. module: account_analytic_plans #: wizard_field:wizard.crossovered.analytic,init,ref:0 @@ -300,7 +300,7 @@ msgstr "" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 msgid "Quantity" -msgstr "" +msgstr "Kwantitas" #. module: account_analytic_plans #: field:account.analytic.plan.instance,account_ids:0 @@ -310,17 +310,17 @@ msgstr "" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 msgid "Code" -msgstr "" +msgstr "Kode" #. module: account_analytic_plans #: wizard_button:create.model,info,end:0 msgid "OK" -msgstr "" +msgstr "Setuju" #. module: account_analytic_plans #: field:account.analytic.plan.line,root_analytic_id:0 msgid "Root Account" -msgstr "" +msgstr "Akun Induk" #. module: account_analytic_plans #: wizard_view:create.model,info:0 @@ -331,12 +331,12 @@ msgstr "" #. module: account_analytic_plans #: field:account.analytic.plan.line,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Berurutan" #. module: account_analytic_plans #: field:account.analytic.plan.instance.line,analytic_account_id:0 msgid "Analytic Account" -msgstr "" +msgstr "Akun Analisis" #. module: account_analytic_plans #: field:account.analytic.default,analytics_id:0 @@ -355,19 +355,19 @@ msgstr "" #. module: account_analytic_plans #: wizard_button:wizard.crossovered.analytic,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Batal" #. module: account_analytic_plans #: wizard_field:wizard.crossovered.analytic,init,date1:0 msgid "Start Date" -msgstr "" +msgstr "Tanggal Mulai" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 msgid "at" -msgstr "" +msgstr "pada" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 msgid "From Date" -msgstr "" +msgstr "Dari Tanggal" diff --git a/addons/account_anglo_saxon/i18n/id.po b/addons/account_anglo_saxon/i18n/id.po new file mode 100644 index 00000000000..bf59eb13b73 --- /dev/null +++ b/addons/account_anglo_saxon/i18n/id.po @@ -0,0 +1,64 @@ +# Indonesian translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2009-11-24 12:50+0000\n" +"PO-Revision-Date: 2010-05-28 02:49+0000\n" +"Last-Translator: Abdul Munif Hanafi <Unknown>\n" +"Language-Team: Indonesian <id@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_anglo_saxon +#: view:product.category:0 +msgid " Accounting Property" +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.module.module,description:account_anglo_saxon.module_meta_information +msgid "" +"This module will support the Anglo-Saxons accounting methodology by \n" +" changing the accounting logic with stock transactions. The difference " +"between the Anglo-Saxon accounting countries \n" +" and the Rhine or also called Continental accounting countries is the " +"moment of taking the Cost of Goods Sold versus Cost of Sales. \n" +" Anglo-Saxons accounting does take the cost when sales invoice is " +"created, Continental accounting will take the cost at he moment the goods " +"are shipped.\n" +" This module will add this functionality by using a interim account, to " +"store the value of shipped goods and will contra book this interim account \n" +" when the invoice is created to transfer this amount to the debtor or " +"creditor account." +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information +msgid "Stock Account" +msgstr "" + +#. module: account_anglo_saxon +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "XML tidak sah untuk Menampilkan Arsitektur!" + +#. module: account_anglo_saxon +#: field:product.category,property_account_creditor_price_difference_categ:0 +#: field:product.template,property_account_creditor_price_difference:0 +msgid "Price Difference Account" +msgstr "" + +#. module: account_anglo_saxon +#: help:product.category,property_account_creditor_price_difference_categ:0 +#: help:product.template,property_account_creditor_price_difference:0 +msgid "" +"This account will be used to value price difference between purchase price " +"and cost price." +msgstr "" diff --git a/addons/account_budget/i18n/id.po b/addons/account_budget/i18n/id.po index 34ed713c9c3..2c3e8b90cca 100644 --- a/addons/account_budget/i18n/id.po +++ b/addons/account_budget/i18n/id.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-09 13:43+0000\n" -"Last-Translator: <>\n" +"PO-Revision-Date: 2010-05-28 02:58+0000\n" +"Last-Translator: Abdul Munif Hanafi <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n" +"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_budget @@ -24,7 +24,7 @@ msgstr "" #. module: account_budget #: rml:account.budget:0 msgid "% performance" -msgstr "" +msgstr "% performa" #. module: account_budget #: model:ir.actions.act_window,name:account_budget.open_budget_post_form @@ -35,18 +35,18 @@ msgstr "" #. module: account_budget #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Nama model tidak sah di definsi aksi" #. module: account_budget #: rml:account.analytic.account.budget:0 #: rml:crossovered.budget.report:0 msgid "Printed at:" -msgstr "" +msgstr "Dicetak pada:" #. module: account_budget #: view:crossovered.budget:0 msgid "Confirm" -msgstr "" +msgstr "Konfirmasi" #. module: account_budget #: field:crossovered.budget,validating_user_id:0 @@ -62,12 +62,12 @@ msgstr "" #. module: account_budget #: selection:crossovered.budget,state:0 msgid "Confirmed" -msgstr "" +msgstr "Dikonfirmasi" #. module: account_budget #: field:account.budget.post.dotation,period_id:0 msgid "Period" -msgstr "" +msgstr "Periode" #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 @@ -80,7 +80,7 @@ msgstr "" #. module: account_budget #: rml:account.budget:0 msgid "Printing date:" -msgstr "" +msgstr "Tanggal dicetak :" #. module: account_budget #: selection:crossovered.budget,state:0 @@ -92,7 +92,7 @@ msgstr "" #: rml:account.budget:0 #: rml:crossovered.budget.report:0 msgid "at" -msgstr "" +msgstr "pada" #. module: account_budget #: view:account.budget.post:0 @@ -102,7 +102,7 @@ msgstr "" #. module: account_budget #: rml:account.budget:0 msgid "Performance" -msgstr "" +msgstr "Kinerja" #. module: account_budget #: rml:account.analytic.account.budget:0 @@ -114,22 +114,22 @@ msgstr "" #. module: account_budget #: rml:account.budget:0 msgid "From" -msgstr "" +msgstr "Dari" #. module: account_budget #: field:crossovered.budget.lines,percentage:0 msgid "Percentage" -msgstr "" +msgstr "Persentase" #. module: account_budget #: rml:account.budget:0 msgid "Results" -msgstr "" +msgstr "Hasil" #. module: account_budget #: field:crossovered.budget,state:0 msgid "Status" -msgstr "" +msgstr "Status" #. module: account_budget #: model:ir.module.module,description:account_budget.module_meta_information @@ -171,7 +171,7 @@ msgstr "" #: rml:account.analytic.account.budget:0 #: rml:crossovered.budget.report:0 msgid "Description" -msgstr "" +msgstr "Keterangan" #. module: account_budget #: rml:account.analytic.account.budget:0 @@ -184,7 +184,7 @@ msgstr "" #: wizard_button:wizard.crossovered.budget,init,report:0 #: wizard_button:wizard.crossovered.budget.summary,init,report:0 msgid "Print" -msgstr "" +msgstr "Cetak" #. module: account_budget #: rml:account.budget:0 @@ -203,7 +203,7 @@ msgstr "" #: rml:account.budget:0 #: rml:crossovered.budget.report:0 msgid "Total :" -msgstr "" +msgstr "Total :" #. module: account_budget #: rml:account.analytic.account.budget:0 @@ -232,7 +232,7 @@ msgstr "" #: view:crossovered.budget:0 #: selection:crossovered.budget,state:0 msgid "Done" -msgstr "" +msgstr "Selesai" #. module: account_budget #: view:crossovered.budget:0 @@ -256,12 +256,12 @@ msgstr "" #: field:crossovered.budget,date_to:0 #: field:crossovered.budget.lines,date_to:0 msgid "End Date" -msgstr "" +msgstr "Tanggal berakhir" #. module: account_budget #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML tidak sah untuk Menampilkan Arsitektur!" #. module: account_budget #: field:crossovered.budget.lines,theoritical_amount:0 @@ -273,7 +273,7 @@ msgstr "" #: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" -msgstr "" +msgstr "Nama" #. module: account_budget #: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu_1 @@ -300,12 +300,12 @@ msgstr "" #: model:ir.model,name:account_budget.model_crossovered_budget #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view msgid "Budget" -msgstr "" +msgstr "Anggaran" #. module: account_budget #: field:account.budget.post.dotation,post_id:0 msgid "Item" -msgstr "" +msgstr "Item" #. module: account_budget #: field:account.budget.post.dotation,amount:0 @@ -316,19 +316,19 @@ msgstr "" #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" -msgstr "" +msgstr "Tanggal Dibayar" #. module: account_budget #: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree #: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree #: model:ir.ui.menu,name:account_budget.next_id_31 msgid "Budgets" -msgstr "" +msgstr "Anggaran" #. module: account_budget #: selection:crossovered.budget,state:0 msgid "Cancelled" -msgstr "" +msgstr "Dibatalkan" #. module: account_budget #: view:account.budget.post.dotation:0 @@ -373,7 +373,7 @@ msgstr "" #: field:account.budget.post,code:0 #: field:crossovered.budget,code:0 msgid "Code" -msgstr "" +msgstr "Kode" #. module: account_budget #: field:account.budget.post.dotation,tot_planned:0 @@ -404,12 +404,12 @@ msgstr "" #. module: account_budget #: field:crossovered.budget.lines,analytic_account_id:0 msgid "Analytic Account" -msgstr "" +msgstr "Akun Analisis" #. module: account_budget #: rml:crossovered.budget.report:0 msgid "Budget :" -msgstr "" +msgstr "Anggaran :" #. module: account_budget #: rml:account.budget:0 @@ -423,12 +423,12 @@ msgstr "" #: view:account.budget.post:0 #: field:account.budget.post,account_ids:0 msgid "Accounts" -msgstr "" +msgstr "Akun" #. module: account_budget #: model:ir.actions.report.xml,name:account_budget.account_budget msgid "Print Budget" -msgstr "" +msgstr "Cetak Anggaran" #. module: account_budget #: view:account.analytic.account:0 @@ -453,7 +453,7 @@ msgstr "" #: wizard_button:wizard.crossovered.budget,init,end:0 #: wizard_button:wizard.crossovered.budget.summary,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Batal" #. module: account_budget #: model:ir.module.module,shortdesc:account_budget.module_meta_information @@ -464,7 +464,7 @@ msgstr "" #: field:crossovered.budget,date_from:0 #: field:crossovered.budget.lines,date_from:0 msgid "Start Date" -msgstr "" +msgstr "Tanggal Mulai" #. module: account_budget #: rml:account.analytic.account.budget:0 @@ -480,4 +480,4 @@ msgstr "" #. module: account_budget #: wizard_view:account.budget.report,init:0 msgid "Select period" -msgstr "" +msgstr "Pilih periode" diff --git a/addons/account_chart/i18n/id.po b/addons/account_chart/i18n/id.po index ebc6cfb3d7b..058e3f8f5a2 100644 --- a/addons/account_chart/i18n/id.po +++ b/addons/account_chart/i18n/id.po @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-09 13:43+0000\n" -"Last-Translator: <>\n" +"PO-Revision-Date: 2010-05-28 02:43+0000\n" +"Last-Translator: Abdul Munif Hanafi <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n" +"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_chart #: model:ir.module.module,description:account_chart.module_meta_information msgid "Remove minimal account chart" -msgstr "" +msgstr "Buang grafik akun minimal" diff --git a/addons/account_date_check/i18n/id.po b/addons/account_date_check/i18n/id.po new file mode 100644 index 00000000000..79a166f2119 --- /dev/null +++ b/addons/account_date_check/i18n/id.po @@ -0,0 +1,32 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * account_date_check +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 5.0.4\n" +"Report-Msgid-Bugs-To: support@openerp.com\n" +"POT-Creation-Date: 2009-08-28 16:01+0000\n" +"PO-Revision-Date: 2010-05-28 02:46+0000\n" +"Last-Translator: Abdul Munif Hanafi <Unknown>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_date_check +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "XML tidak sah untuk Menampilkan Arsitektur!" + +#. module: account_date_check +#: field:account.journal,allow_date:0 +msgid "Allows date not in the period" +msgstr "" + +#. module: account_date_check +#: model:ir.module.module,shortdesc:account_date_check.module_meta_information +msgid "Account Date check" +msgstr "Tanggal periksa Akun" diff --git a/addons/account_followup/i18n/pt.po b/addons/account_followup/i18n/pt.po index 7246ad73a2e..11aa146ef83 100644 --- a/addons/account_followup/i18n/pt.po +++ b/addons/account_followup/i18n/pt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-28 23:22+0000\n" -"Last-Translator: Paulino <Unknown>\n" +"PO-Revision-Date: 2010-05-28 02:17+0000\n" +"Last-Translator: cmsa <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n" +"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_followup @@ -35,7 +35,7 @@ msgstr "Ref. do Cliente:" #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all #: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile_payable msgid "All payable entries" -msgstr "Todas os movimentos a pagar" +msgstr "Todos os movimentos a pagar" #. module: account_followup #: constraint:ir.actions.act_window:0 @@ -50,7 +50,7 @@ msgstr "Mensagem impressa" #. module: account_followup #: rml:account_followup.followup.print:0 msgid "Amount In Currency" -msgstr "Montante em Divisa" +msgstr "Montante em Numerário" #. module: account_followup #: rml:account_followup.followup.print:0 @@ -71,13 +71,13 @@ msgstr "%(user_signature)s: Nome de utilizador" #. module: account_followup #: wizard_view:account_followup.followup.print.all,next:0 msgid "Select partners" -msgstr "Seleccionar Terceiros" +msgstr "Seleccionar Parceiros" #. module: account_followup #: view:account_followup.followup:0 #: field:account_followup.followup,followup_line:0 msgid "Follow-Up" -msgstr "Continuação" +msgstr "Dar Seguimento" #. module: account_followup #: field:account_followup.stat,debit:0 @@ -87,7 +87,7 @@ msgstr "Débito" #. module: account_followup #: wizard_view:account_followup.followup.print.all,next:0 msgid "Email Settings" -msgstr "" +msgstr "Parâmetros de Email" #. module: account_followup #: field:account_followup.stat,account_type:0 @@ -97,34 +97,34 @@ msgstr "Tipo de Conta" #. module: account_followup #: rml:account_followup.followup.print:0 msgid "Ref" -msgstr "Referençia" +msgstr "Ref" #. module: account_followup #: wizard_view:account_followup.followup.print.all,next:0 msgid "%(followup_amount)s: Total Amount Due" -msgstr "% (montante_de_seguimentos)s: Quantidade total devido" +msgstr "%(followup_amount)s: Quantidade total devido" #. module: account_followup #: view:account_followup.followup.line:0 #: wizard_view:account_followup.followup.print.all,next:0 msgid "%(date)s: Current Date" -msgstr "%(data)s: Data actual" +msgstr "%(date)s: Data actual" #. module: account_followup #: field:account.move.line,followup_date:0 msgid "Latest Follow-up" -msgstr "Ultimos seguimentos" +msgstr "Últimos seguimentos" #. module: account_followup #: field:account_followup.followup.line,followup_id:0 #: field:account_followup.stat,followup_id:0 msgid "Follow Ups" -msgstr "Sguimentos" +msgstr "Seguimentos" #. module: account_followup #: wizard_field:account_followup.followup.print.all,init,date:0 msgid "Follow-up Sending Date" -msgstr "" +msgstr "Seguimento da data de envio" #. module: account_followup #: view:account_followup.followup:0 @@ -151,7 +151,7 @@ msgstr "Empresa" #. module: account_followup #: rml:account_followup.followup.print:0 msgid "Invoice Date" -msgstr "" +msgstr "Data da Factura" #. module: account_followup #: wizard_field:account_followup.followup.print.all,next,email_subject:0 @@ -166,17 +166,17 @@ msgstr "Pago" #. module: account_followup #: wizard_view:account_followup.followup.print.all,next:0 msgid "%(line)s: Account Move lines" -msgstr "%(linha)s: Linhas de movimento de contas" +msgstr "%(line)s: Linhas de movimento de contas" #. module: account_followup #: field:account_followup.stat,date_followup:0 msgid "Latest followup" -msgstr "Ultimos Seguimentos" +msgstr "Últimos Seguimentos" #. module: account_followup #: view:account.move.line:0 msgid "Partner entries" -msgstr "Entradas de terceiros" +msgstr "Entradas de parceiros" #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_followup_line @@ -186,7 +186,7 @@ msgstr "Critérios de seguimento" #. module: account_followup #: wizard_view:account_followup.followup.print.all,next:0 msgid "Partner Selection" -msgstr "" +msgstr "Selecção de Parceiros" #. module: account_followup #: constraint:ir.ui.view:0 @@ -201,12 +201,12 @@ msgstr "Tipo de termo" #. module: account_followup #: wizard_view:account_followup.followup.print.all,init:0 msgid "Follow-up and Date Selection" -msgstr "" +msgstr "Seguimento e Selecção da Data" #. module: account_followup #: wizard_view:account_followup.followup.print.all,next:0 msgid "Select partners to remind" -msgstr "Seleccionar terceiros para lembrar" +msgstr "Seleccionar parceiros para lembrar" #. module: account_followup #: rml:account_followup.followup.print:0 @@ -230,6 +230,19 @@ msgid "" "Best Regards,\n" "\t\t\t" msgstr "" +"\n" +"Caro %(partner_name)s,\n" +"\n" +"À excepção feita se houver um erro nosso, parece que o seguinte montante " +"ainda está por pagar. Por favor, tome as medidas adequadas a fim de efectuar " +"esse pagamento nos próximos oito dias.\n" +"\n" +"Se o seu pagamento tiver sido realizado após este e-mail ter sido enviado, " +"por favor, considere o presente como nulos. Não hesite em entrar em contato " +"com nosso departamento de contabilidade (+32) .10.68.94.39.\n" +"\n" +"Atenciosamente,\n" +"\t\t\t" #. module: account_followup #: constraint:ir.model:0 @@ -241,7 +254,7 @@ msgstr "" #. module: account_followup #: wizard_button:account_followup.followup.print.all,summary,end:0 msgid "Ok" -msgstr "" +msgstr "Ok" #. module: account_followup #: field:account_followup.followup,name:0 @@ -263,7 +276,7 @@ msgstr "Fim do mês" #: view:account_followup.followup.line:0 #: wizard_view:account_followup.followup.print.all,next:0 msgid "%(company_name)s: User's Company name" -msgstr "" +msgstr "%(company_name)s: Nome da empresa do utilizador" #. module: account_followup #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all @@ -305,23 +318,23 @@ msgstr "Continuar" #. module: account_followup #: model:ir.module.module,shortdesc:account_followup.module_meta_information msgid "Accounting follow-ups management" -msgstr "" +msgstr "Gestão do seguimento da conta" #. module: account_followup #: wizard_view:account_followup.followup.print.all,summary:0 #: wizard_field:account_followup.followup.print.all,summary,summary:0 msgid "Summary" -msgstr "" +msgstr "Resumo" #. module: account_followup #: view:account_followup.followup.line:0 msgid "Follow-Up Lines" -msgstr "" +msgstr "Linhas de Seguimento" #. module: account_followup #: rml:account_followup.followup.print:0 msgid "Document : Customer account statement" -msgstr "" +msgstr "Documento: Declaração da conta do cliente" #. module: account_followup #: view:account_followup.stat:0 @@ -331,7 +344,7 @@ msgstr "Linhas de seguimento" #. module: account_followup #: wizard_view:account_followup.followup.print.all,next:0 msgid "%(company_currency)s: User's Company Currency" -msgstr "" +msgstr "%(company_currency)s: Divisa da Companhia do Utilizador" #. module: account_followup #: field:account_followup.stat,balance:0 @@ -343,6 +356,8 @@ msgstr "Saldo" msgid "" "This field allow you to select a forecast date to plan your follow-ups" msgstr "" +"Este campo permite-lhe a selecção de uma data para programar os seus " +"seguimentos" #. module: account_followup #: view:account.move.line:0 @@ -373,6 +388,27 @@ msgid "" "Best Regards,\n" "\t\t\t" msgstr "" +"\n" +"Caro %(partner_name)s,\n" +"\n" +"Estamos desapontados em ver que apesar de o envio de um lembrete de que sua " +"conta está seriamente atrasada.\n" +"\n" +"É essencial que o pagamento seja feito, caso contrário, teremos que " +"considerar um stop em sua conta o que significa que não seremos mais capazes " +"de fornecer à sua empresa (produtos/serviços).\n" +"Por favor, tome as medidas adequadas a fim de efectuar esse pagamento nos " +"próximos 8 dias.\n" +"\n" +"Se houver um problema com o pagamento da factura que não temos conhecimento " +"de, não hesite em entrar em contato com o nosso departamento de " +"contabilidade (+32) .10.68.94.39. para que possamos resolver a questão " +"rapidamente.\n" +"\n" +"Detalhes dos pagamentos devidos é impresso abaixo.\n" +"\n" +"Atenciosamente,\n" +"\t\t\t" #. module: account_followup #: rml:account_followup.followup.print:0 @@ -382,7 +418,7 @@ msgstr "Sub-Total:" #. module: account_followup #: selection:account_followup.followup.line,start:0 msgid "Net Days" -msgstr "Dias líquidos" +msgstr "Dias Líquidos" #. module: account_followup #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form @@ -402,7 +438,7 @@ msgstr "Corpo do e-mail" #. module: account_followup #: field:account_followup.stat,date_move_last:0 msgid "Last move" -msgstr "Ultimo movimento" +msgstr "Último movimento" #. module: account_followup #: rml:account_followup.followup.print:0 @@ -434,11 +470,27 @@ msgid "" "Best Regards,\n" "\t\t\t" msgstr "" +"\n" +"Caro %(partner_name)s,\n" +"\n" +"Apesar de várias insistências, a conta ainda não está resolvida.\n" +"\n" +"A não ser que o pagamento integral seja feita nos próximos oito dias, então " +"a ação legal para a cobrança da dívida, será tomada sem aviso prévio.\n" +"\n" +"Espero que não seja necessário tomar essa medida, os detalhes de pagamentos " +"estão impressos abaixo.\n" +"\n" +"Em caso de quaisquer dúvidas sobre esta questão, não hesite em entrar em " +"contato com nosso departamento de contabilidade (+32) .10.68.94.39.\n" +"\n" +"Atenciosamente,\n" +"\t\t\t" #. module: account_followup #: rml:account_followup.followup.print:0 msgid "Maturity Date" -msgstr "" +msgstr "Data de vencimento" #. module: account_followup #: view:account_followup.followup.line:0 @@ -454,13 +506,13 @@ msgstr "Sequência" #. module: account_followup #: wizard_view:account_followup.followup.print.all,next:0 msgid "%(heading)s: Move line header" -msgstr "%(cabeçalho)s: Mover linha de cabeçalho" +msgstr "%(heading)s: Mover linha de cabeçalho" #. module: account_followup #: view:account_followup.followup.line:0 #: wizard_view:account_followup.followup.print.all,next:0 msgid "%(partner_name)s: Partner name" -msgstr "%(nome_de_terceiro)s: Nome do terceiro" +msgstr "%(partner_name)s: Nome do terceiro" #. module: account_followup #: wizard_field:account_followup.followup.print.all,next,email_conf:0 @@ -470,12 +522,12 @@ msgstr "Enviar confirmação de e-mail" #. module: account_followup #: wizard_field:account_followup.followup.print.all,init,followup_id:0 msgid "Follow-up" -msgstr "" +msgstr "Seguimento" #. module: account_followup #: field:account_followup.stat,name:0 msgid "Partner" -msgstr "Terceiro" +msgstr "Parceiro" #. module: account_followup #: wizard_button:account_followup.followup.print.all,init,end:0 @@ -491,4 +543,4 @@ msgstr "Dias de atraso" #. module: account_followup #: wizard_button:account_followup.followup.print.all,next,print:0 msgid "Print Follow Ups & Send Mails" -msgstr "" +msgstr "Imprimir Segmentos e Enviar Mensagens" diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py index 7da226b3188..f7ff9ad9ef1 100644 --- a/addons/account_voucher/voucher.py +++ b/addons/account_voucher/voucher.py @@ -21,7 +21,8 @@ import time import netsvc -from osv import fields, osv +from osv import fields +from osv import osv import ir import pooler import mx.DateTime @@ -30,13 +31,13 @@ from tools import config type2journal = { 'rec_voucher': 'cash', - 'bank_rec_voucher': 'cash', + 'bank_rec_voucher': 'bank', 'pay_voucher': 'cash', - 'bank_pay_voucher': 'cash', + 'bank_pay_voucher': 'bank', 'cont_voucher': 'cash', 'journal_sale_vou': 'sale', 'journal_pur_voucher': 'purchase', - 'journal_voucher':'expanse' + 'journal_voucher':'general' } class ir_sequence_type(osv.osv): @@ -56,7 +57,10 @@ account_journal() class account_voucher(osv.osv): - def _get_period(self, cr, uid, context): + def _get_period(self, cr, uid, context={}): + if context.get('period_id', False): + return context.get('period_id') + periods = self.pool.get('account.period').find(cr, uid) if periods: return periods[0] @@ -107,7 +111,7 @@ class account_voucher(osv.osv): ('journal_sale_vou','Journal Sale'), ('journal_pur_voucher','Journal Purchase'), ('journal_voucher','Journal Voucher'), - ],'Type', readonly=True, select=True , size=128), + ],'Entry Type', select=True , size=128, readonly=True, states={'draft':[('readonly',False)]}), 'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}), 'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}), 'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}, domain=[('type','<>','view')]), @@ -139,43 +143,60 @@ class account_voucher(osv.osv): } _defaults = { - 'state': lambda *a: 'draft', - 'date' : lambda *a: time.strftime('%Y-%m-%d'), 'period_id': _get_period, 'type': _get_type, - 'reference_type': lambda *a: 'none', 'journal_id':_get_journal, - 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher', context=c), 'currency_id': _get_currency, + + 'state': lambda *a: 'draft', + 'date' : lambda *a: time.strftime('%Y-%m-%d'), + 'reference_type': lambda *a: "none", + 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher',context=c), } - def _get_analityc_lines(self, cr, uid, id): - inv = self.browse(cr, uid, [id])[0] - cur_obj = self.pool.get('res.currency') +# def _get_analityc_lines(self, cr, uid, id): +# inv = self.browse(cr, uid, [id])[0] +# cur_obj = self.pool.get('res.currency') def onchange_account(self, cr, uid, ids, account_id): + if not account_id: - return {'value':{'amount':False}} - account = self.pool.get('account.account').browse(cr,uid,account_id) + return { + 'value':{'amount':False} + } + + account = self.pool.get('account.account').browse(cr, uid, account_id) balance=account.balance - return {'value':{'amount':balance}} + return { + 'value':{'amount':balance} + } def onchange_journal(self, cr, uid, ids, journal_id, type): if not journal_id: - return {'value':{'account_id':False}} + return { + 'value':{'account_id':False} + } + journal = self.pool.get('account.journal') + if journal_id and (type in ('rec_voucher','bank_rec_voucher','journal_pur_voucher','journal_voucher')): account_id = journal.browse(cr, uid, journal_id).default_debit_account_id - return {'value':{'account_id':account_id.id}} + return { + 'value':{'account_id':account_id.id} + } elif journal_id and (type in ('pay_voucher','bank_pay_voucher','journal_sale_vou')) : account_id = journal.browse(cr, uid, journal_id).default_credit_account_id - return {'value':{'account_id':account_id.id}} + return { + 'value':{'account_id':account_id.id} + } else: account_id = journal.browse(cr, uid, journal_id).default_credit_account_id - return {'value':{'account_id':account_id.id}} + return { + 'value':{'account_id':account_id.id} + } def open_voucher(self, cr, uid, ids, context={}): - obj = self.pool.get('account.voucher').browse(cr,uid,ids) + obj = self.pool.get('account.voucher').browse(cr, uid, ids) total = 0 for i in obj[0].payment_ids: total += i.amount @@ -208,8 +229,7 @@ class account_voucher(osv.osv): unlink_ids.append(t['id']) else: raise osv.except_osv('Invalid action !', 'Cannot delete Voucher(s) which are already opened or paid !') - osv.osv.unlink(self, cr, uid, unlink_ids) - return True + return super(account_voucher, self).unlink(self, cr, uid, unlink_ids) def _get_analytic_lines(self, cr, uid, id): inv = self.browse(cr, uid, [id])[0] @@ -242,9 +262,12 @@ class account_voucher(osv.osv): return iml def action_move_line_create(self, cr, uid, ids, *args): + for inv in self.browse(cr, uid, ids): + if inv.move_id: continue + company_currency = inv.company_id.currency_id.id line_ids = self.read(cr, uid, [inv.id], ['payment_ids'])[0]['payment_ids'] @@ -312,7 +335,8 @@ class account_voucher(osv.osv): 'name' : name, 'journal_id': journal_id, 'type' : inv.type, - 'narration' : inv.narration + 'narration' : inv.narration, + 'date':inv.date } if inv.period_id: move['period_id'] = inv.period_id.id @@ -362,13 +386,14 @@ class account_voucher(osv.osv): elif line.type == 'cr': move_line['credit'] = line.amount or False amount=line.amount * (-1) - + + move_line['analytic_account_id'] = line.account_analytic_id.id or False ml_id=self.pool.get('account.move.line').create(cr, uid, move_line) if inv.narration: - line.name=inv.narration + line.name = inv.narration else: - line.name=line.name + line.name = line.name if line.account_analytic_id: an_line = { @@ -393,7 +418,6 @@ class account_voucher(osv.osv): def line_get_convert(self, cr, uid, x, date, context={}): - return { 'date':date, 'date_maturity': x.get('date_maturity', False), @@ -409,6 +433,7 @@ class account_voucher(osv.osv): 'tax_amount': x.get('tax_amount', False), 'ref':x.get('ref',False) } + def _convert_ref(self, cr, uid, ref): return (ref or '').replace('/','') @@ -547,7 +572,6 @@ class account_voucher_line(osv.osv): if not amount: return {'value' : {}} if partner_id: - obj = self.pool.get('res.partner') if type1 in ('rec_voucher', 'bank_rec_voucher', 'journal_voucher'): if amount < 0 : @@ -583,34 +607,23 @@ class account_voucher_line(osv.osv): else: if type1 in ('rec_voucher', 'bank_rec_voucher', 'journal_voucher'): if amount < 0 : - type = 'dr' else: - type = 'cr' - elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') : if amount < 0 : - type = 'cr' else: - type = 'dr' - elif type1 in ('journal_sale_vou') : if amount < 0 : - type = 'cr' else: - type = 'dr' - elif type1 in ('journal_pur_voucher') : if amount< 0 : - type = 'dr' else: - type = 'cr' return { @@ -619,9 +632,7 @@ class account_voucher_line(osv.osv): def onchange_type(self, cr, uid, ids,partner_id,amount,type,type1): if partner_id: - obj = self.pool.get('res.partner') - if type1 in ('rec_voucher','bank_rec_voucher', 'journal_voucher'): if type == 'dr' : account_id = obj.browse(cr, uid, partner_id).property_account_payable @@ -645,7 +656,6 @@ class account_voucher_line(osv.osv): else: account_id = obj.browse(cr, uid, partner_id).property_account_receivable total=amount*(-1) - elif type1 in ('journal_pur_voucher') : if type == 'dr' : account_id = obj.browse(cr, uid, partner_id).property_account_receivable @@ -656,34 +666,25 @@ class account_voucher_line(osv.osv): else: if type1 in ('rec_voucher','bank_rec_voucher', 'journal_voucher'): if type == 'dr' : - total=amount*(-1) else: - total=amount*(-1) elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') : if type == 'cr' : - total=amount*(-1) else: - total=amount*(-1) elif type1 in ('journal_sale_vou') : if type == 'cr' : - total=amount*(-1) else: - total=amount*(-1) - elif type1 in ('journal_pur_voucher') : if type == 'dr' : - total=amount*(-1) else: - total=amount*(-1) return { @@ -702,9 +703,3 @@ class account_voucher_line(osv.osv): } account_voucher_line() - - - - - - diff --git a/addons/account_voucher/voucher_sequence.xml b/addons/account_voucher/voucher_sequence.xml index a8e56728542..c7f56051014 100644 --- a/addons/account_voucher/voucher_sequence.xml +++ b/addons/account_voucher/voucher_sequence.xml @@ -1,110 +1,90 @@ <?xml version="1.0" encoding="UTF-8"?> <openerp> + <data noupdate="1"> + <record model="res.request.link" id="req_link_voucher"> + <field name="name">Voucher</field> + <field name="object">account.voucher</field> + </record> + <!-- + Sequences types for vouchers + --> + <record model="ir.sequence.type" id="seq_type_cash_rec_voucher"> + <field name="name">Cash Receipt</field> + <field name="code">rec_voucher</field> + </record> + + <record model="ir.sequence.type" id="seq_type_cash_pay_voucher"> + <field name="name">Cash Payment</field> + <field name="code">pay_voucher</field> + </record> + <record model="ir.sequence.type" id="seq_type_bank_rec_voucher"> + <field name="name">Bank Receipt</field> + <field name="code">bank_rec_voucher</field> + </record> + <record model="ir.sequence.type" id="seq_type_bank_pay_voucher"> + <field name="name">Bank Payment</field> + <field name="code">bank_pay_voucher</field> + </record> + <record model="ir.sequence.type" id="seq_type_contra_voucher"> + <field name="name">Contra Entry</field> + <field name="code">cont_voucher</field> + </record> + <record model="ir.sequence.type" id="seq_type_jou_sale_voucher"> + <field name="name">Sales Entry</field> + <field name="code">journal_sale_vou</field> + </record> + <record model="ir.sequence.type" id="seq_type_jou_pur_voucher"> + <field name="name">Purchase Entry</field> + <field name="code">journal_pur_vou</field> + </record> + + <!-- + Sequences for vouchers + --> + <record model="ir.sequence" id="seq_cash_rec_voucher"> + <field name="name">Cash Receipt</field> + <field name="code">rec_voucher</field> + <field name="padding" eval="3"/> + <field name="prefix">%(year)s/</field> + </record> + + <record model="ir.sequence" id="seq_cash_pay_voucher"> + <field name="name">Cash Payment</field> + <field name="code">pay_voucher</field> + <field name="padding" eval="3"/> + <field name="prefix">%(year)s/</field> + </record> + <record model="ir.sequence" id="seq_bank_rec_voucher"> + <field name="name">Bank Receipt</field> + <field name="code">bank_rec_voucher</field> + <field name="padding" eval="3"/> + <field name="prefix">%(year)s/</field> + </record> + <record model="ir.sequence" id="seq_bank_pay_voucher"> + <field name="name">Bank Payment</field> + <field name="code">bank_pay_voucher</field> + <field name="padding" eval="3"/> + <field name="prefix">%(year)s/</field> + </record> + <record model="ir.sequence" id="seq_contra_voucher"> + <field name="name">Contra Entry</field> + <field name="code">cont_voucher</field> + <field name="padding" eval="3"/> + <field name="prefix">%(year)s/</field> + </record> + <record model="ir.sequence" id="seq_jou_sale_voucher"> + <field name="name">Sales Entry</field> + <field name="code">journal_sale_vou</field> + <field name="padding" eval="3"/> + <field name="prefix">%(year)s/</field> + </record> + <record model="ir.sequence" id="seq_jou_pur_voucher"> + <field name="name">Purchase Entry</field> + <field name="code">journal_pur_vou</field> + <field name="padding" eval="3"/> + <field name="prefix">%(year)s/</field> + </record> -<data noupdate="1"> - <record model="res.request.link" id="req_link_voucher"> - <field name="name">Voucher</field> - <field name="object">account.voucher</field> - </record> - - <!-- - Sequences types for vouchers - --> - <record model="ir.sequence.type" id="seq_type_cash_rec_voucher"> - <field name="name">Account Cash Received Voucher</field> - <field name="code">rec_voucher</field> - </record> - - <record model="ir.sequence.type" id="seq_type_cash_pay_voucher"> - <field name="name">Account Cash Payble Voucher</field> - <field name="code">pay_voucher</field> - </record> - <record model="ir.sequence.type" id="seq_type_bank_rec_voucher"> - <field name="name">Account Bank Received Voucher</field> - <field name="code">bank_rec_voucher</field> - </record> - <record model="ir.sequence.type" id="seq_type_bank_pay_voucher"> - <field name="name">Account Bank Payble Voucher</field> - <field name="code">bank_pay_voucher</field> - </record> - <record model="ir.sequence.type" id="seq_type_contra_voucher"> - <field name="name">Account Contra Voucher</field> - <field name="code">cont_voucher</field> - </record> - <record model="ir.sequence.type" id="seq_type_jou_sale_voucher"> - <field name="name">Account Journal Voucher</field> - <field name="code">journal_sale_vou</field> - </record> - <record model="ir.sequence.type" id="seq_type_jou_pur_voucher"> - <field name="name">Account Journal Voucher</field> - <field name="code">journal_pur_vou</field> - </record> - - <!-- - Sequences for vouchers - --> - <record model="ir.sequence" id="seq_cash_rec_voucher"> - <field name="name">Account Cash Received Voucher</field> - <field name="code">rec_voucher</field> - <field name="padding" eval="3"/> - <field name="prefix">%(year)s/</field> - </record> - - <record model="ir.sequence" id="seq_cash_pay_voucher"> - <field name="name">Account Cash Payble Voucher</field> - <field name="code">pay_voucher</field> - <field name="padding" eval="3"/> - <field name="prefix">%(year)s/</field> - </record> - <record model="ir.sequence" id="seq_bank_rec_voucher"> - <field name="name">Account Bank Received Voucher</field> - <field name="code">bank_rec_voucher</field> - <field name="padding" eval="3"/> - <field name="prefix">%(year)s/</field> - </record> - <record model="ir.sequence" id="seq_bank_pay_voucher"> - <field name="name">Account Bank Payble Voucher</field> - <field name="code">bank_pay_voucher</field> - <field name="padding" eval="3"/> - <field name="prefix">%(year)s/</field> - </record> - <record model="ir.sequence" id="seq_contra_voucher"> - <field name="name">Account Contra Voucher</field> - <field name="code">cont_voucher</field> - <field name="padding" eval="3"/> - <field name="prefix">%(year)s/</field> - </record> - <record model="ir.sequence" id="seq_jou_sale_voucher"> - <field name="name">Account Journal Voucher</field> - <field name="code">journal_sale_vou</field> - <field name="padding" eval="3"/> - <field name="prefix">%(year)s/</field> - </record> - <record model="ir.sequence" id="seq_jou_pur_voucher"> - <field name="name">Account Journal Voucher</field> - <field name="code">journal_pur_vou</field> - <field name="padding" eval="3"/> - <field name="prefix">%(year)s/</field> - </record> - - <!-- - Sequences types for analytic account - - <record model="ir.sequence.type" id="seq_type_analytic_account"> - <field name="name">Analytic account</field> - <field name="code">account.analytic.account</field> - </record> - - - Sequence for analytic account - - <record model="ir.sequence" id="seq_analytic_account"> - <field name="name">Analytic account sequence</field> - <field name="code">account.analytic.account</field> - <field name="padding" eval="3" /> - <field name="number_next" eval="2708" /> - </record> - --> -</data> + </data> </openerp> diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml index 08262bb17df..6eb6988480d 100644 --- a/addons/account_voucher/voucher_view.xml +++ b/addons/account_voucher/voucher_view.xml @@ -28,12 +28,10 @@ <form string="Accounting Voucher"> <group col="6" colspan="4"> <field name="name" colspan="4"/> + <field name="number"/> <field name="journal_id" select="1" on_change="onchange_journal(journal_id,type)"/> <field name="account_id" on_change="onchange_account(account_id)"/> <field name="type" on_change="onchange_journal(journal_id,type)"/> - <field name="number"/> - <!--field name="amount" select="1" invisible="1"/--> - <!--field name="partner_id"/--> </group> <notebook colspan="4"> <page string="Journal Entries"> @@ -100,147 +98,153 @@ <filter string="Type" icon="terp-account" domain="[]" context="{'group_by':'type', 'set_visible':True}"/> <filter string="States" icon="terp-account" domain="[]" context="{'group_by':'state'}"/> </group> + <newline/> + <group expand="1" string="Extended options..."> + <field name="journal_id" widget="selection" context="{'journal_id': self}" /> + <field name="period_id" widget="selection" context="{'period_id': self}" groups="base.group_extended"/> + <field name="type" context="{'type': self}" /> + </group> </search> </field> </record> <!-- Receipt Vouchers --> <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list"> - <field name="name">Receivable Entries</field> + <field name="name">Voucher Entries</field> <field name="res_model">account.voucher</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> <field name="view_id" eval="view_voucher_tree"/> - <field name="domain">[('type','like','rec_voucher')]</field> - <field name="context">{'type':'rec_voucher'}</field> +<!-- <field name="domain">[('type','like','rec_voucher')]</field>--> +<!-- <field name="context">{'type':'rec_voucher'}</field>--> </record> <menuitem id="menu_action_receipt_vou_voucher_list" action="action_receipt_vou_voucher_list" parent="account.menu_finance_entries" sequence="8"/> - <record model="ir.actions.act_window" id="action_receipt_cashreceipt_voucher_list"> - <field name="name">Cash Receipt</field> - <field name="res_model">account.voucher</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form</field> - <field name="view_id" eval="view_voucher_tree"/> - <field name="domain">[('type','=','rec_voucher')]</field> - <field name="context">{'type':'rec_voucher'}</field> - </record> - <menuitem id="menu_action_receipt_cashreceipt_voucher_list" - action="action_receipt_cashreceipt_voucher_list" parent="menu_action_receipt_vou_voucher_list"/> +<!-- <record model="ir.actions.act_window" id="action_receipt_cashreceipt_voucher_list">--> +<!-- <field name="name">Cash Receipt</field>--> +<!-- <field name="res_model">account.voucher</field>--> +<!-- <field name="view_type">form</field>--> +<!-- <field name="view_mode">tree,form</field>--> +<!-- <field name="view_id" eval="view_voucher_tree"/>--> +<!-- <field name="domain">[('type','=','rec_voucher')]</field>--> +<!-- <field name="context">{'type':'rec_voucher'}</field>--> +<!-- </record>--> +<!-- <menuitem id="menu_action_receipt_cashreceipt_voucher_list"--> +<!-- action="action_receipt_cashreceipt_voucher_list" parent="menu_action_receipt_vou_voucher_list"/>--> - <record model="ir.actions.act_window" id="action_receipt_bakreceipt_voucher_list"> - <field name="name">Bank Receipt</field> - <field name="res_model">account.voucher</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form</field> - <field name="view_id" eval="view_voucher_tree"/> - <field name="domain">[('type','=','bank_rec_voucher')]</field> - <field name="context">{'type':'bank_rec_voucher'}</field> - </record> - <menuitem id="menu_action_receipt_bakreceipt_voucher_list" - action="action_receipt_bakreceipt_voucher_list" parent="menu_action_receipt_vou_voucher_list"/> +<!-- <record model="ir.actions.act_window" id="action_receipt_bakreceipt_voucher_list">--> +<!-- <field name="name">Bank Receipt</field>--> +<!-- <field name="res_model">account.voucher</field>--> +<!-- <field name="view_type">form</field>--> +<!-- <field name="view_mode">tree,form</field>--> +<!-- <field name="view_id" eval="view_voucher_tree"/>--> +<!-- <field name="domain">[('type','=','bank_rec_voucher')]</field>--> +<!-- <field name="context">{'type':'bank_rec_voucher'}</field>--> +<!-- </record>--> +<!-- <menuitem id="menu_action_receipt_bakreceipt_voucher_list"--> +<!-- action="action_receipt_bakreceipt_voucher_list" parent="menu_action_receipt_vou_voucher_list"/>--> <!-- End Receipt Vouchers --> <!-- Payment Vouchers --> - <record model="ir.actions.act_window" id="action_payments_voucher_list"> - <field name="name">Payable Entries</field> - <field name="res_model">account.voucher</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form</field> - <field name="view_id" eval="view_voucher_tree"/> - <field name="domain">[('type','like','pay_voucher')]</field> - <field name="context">{'type':'pay_voucher'}</field> - </record> - <menuitem id="menu_action_payments_voucher_list" - action="action_payments_voucher_list" parent="account.menu_finance_entries" sequence="8"/> +<!-- <record model="ir.actions.act_window" id="action_payments_voucher_list">--> +<!-- <field name="name">Payable Entries</field>--> +<!-- <field name="res_model">account.voucher</field>--> +<!-- <field name="view_type">form</field>--> +<!-- <field name="view_mode">tree,form</field>--> +<!-- <field name="view_id" eval="view_voucher_tree"/>--> +<!-- <field name="domain">[('type','like','pay_voucher')]</field>--> +<!-- <field name="context">{'type':'pay_voucher'}</field>--> +<!-- </record>--> +<!-- <menuitem id="menu_action_payments_voucher_list"--> +<!-- action="action_payments_voucher_list" parent="account.menu_finance_entries" sequence="8"/>--> - <record model="ir.actions.act_window" id="action_payments_cashpay_voucher_list"> - <field name="name">Cash Payment</field> - <field name="res_model">account.voucher</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form</field> - <field name="view_id" eval="view_voucher_tree"/> - <field name="domain">[('type','=','pay_voucher')]</field> - <field name="context">{'type':'pay_voucher'}</field> - </record> - <menuitem id="menu_action_payments_cashpay_voucher_list" - action="action_payments_cashpay_voucher_list" parent="menu_action_payments_voucher_list"/> +<!-- <record model="ir.actions.act_window" id="action_payments_cashpay_voucher_list">--> +<!-- <field name="name">Cash Payment</field>--> +<!-- <field name="res_model">account.voucher</field>--> +<!-- <field name="view_type">form</field>--> +<!-- <field name="view_mode">tree,form</field>--> +<!-- <field name="view_id" eval="view_voucher_tree"/>--> +<!-- <field name="domain">[('type','=','pay_voucher')]</field>--> +<!-- <field name="context">{'type':'pay_voucher'}</field>--> +<!-- </record>--> +<!-- <menuitem id="menu_action_payments_cashpay_voucher_list"--> +<!-- action="action_payments_cashpay_voucher_list" parent="menu_action_payments_voucher_list"/>--> - <record model="ir.actions.act_window" id="action_payments_bankpay_voucher_list"> - <field name="name">Bank Payment</field> - <field name="res_model">account.voucher</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form</field> - <field name="view_id" eval="view_voucher_tree"/> - <field name="domain">[('type','=','bank_pay_voucher')]</field> - <field name="context">{'type':'bank_pay_voucher'}</field> - </record> - <menuitem id="menu_action_payments_bankpay_voucher_list" - action="action_payments_bankpay_voucher_list" parent="menu_action_payments_voucher_list"/> +<!-- <record model="ir.actions.act_window" id="action_payments_bankpay_voucher_list">--> +<!-- <field name="name">Bank Payment</field>--> +<!-- <field name="res_model">account.voucher</field>--> +<!-- <field name="view_type">form</field>--> +<!-- <field name="view_mode">tree,form</field>--> +<!-- <field name="view_id" eval="view_voucher_tree"/>--> +<!-- <field name="domain">[('type','=','bank_pay_voucher')]</field>--> +<!-- <field name="context">{'type':'bank_pay_voucher'}</field>--> +<!-- </record>--> +<!-- <menuitem id="menu_action_payments_bankpay_voucher_list"--> +<!-- action="action_payments_bankpay_voucher_list" parent="menu_action_payments_voucher_list"/>--> - <!-- End Payment Vouchers --> + <!-- End Payment Vouchers --> <!-- Other Voucher Enries --> - <record model="ir.actions.act_window" id="action_other_voucher_list"> - <field name="name">Other Entries</field> - <field name="res_model">account.voucher</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form</field> - <field name="view_id" eval="view_voucher_tree"/> - </record> - <menuitem id="menu_action_other_voucher_list" - action="action_other_voucher_list" parent="account.menu_finance_entries" sequence="8"/> +<!-- <record model="ir.actions.act_window" id="action_other_voucher_list">--> +<!-- <field name="name">Other Entries</field>--> +<!-- <field name="res_model">account.voucher</field>--> +<!-- <field name="view_type">form</field>--> +<!-- <field name="view_mode">tree,form</field>--> +<!-- <field name="view_id" eval="view_voucher_tree"/>--> +<!-- </record>--> +<!-- <menuitem id="menu_action_other_voucher_list"--> +<!-- action="action_other_voucher_list" parent="account.menu_finance_entries" sequence="8"/>--> - <record model="ir.actions.act_window" id="action_view_cont_voucher_form"> - <field name="name">Contra Entries</field> - <field name="res_model">account.voucher</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form</field> - <field name="view_id" eval="view_voucher_tree"/> - <field name="domain">[('type','=','cont_voucher')]</field> - <field name="context">{'type':'cont_voucher'}</field> - </record> - <menuitem id="menu_action_view_cont_voucher_form" - action="action_view_cont_voucher_form" parent="menu_action_other_voucher_list"/> +<!-- <record model="ir.actions.act_window" id="action_view_cont_voucher_form">--> +<!-- <field name="name">Contra Entries</field>--> +<!-- <field name="res_model">account.voucher</field>--> +<!-- <field name="view_type">form</field>--> +<!-- <field name="view_mode">tree,form</field>--> +<!-- <field name="view_id" eval="view_voucher_tree"/>--> +<!-- <field name="domain">[('type','=','cont_voucher')]</field>--> +<!-- <field name="context">{'type':'cont_voucher'}</field>--> +<!-- </record>--> +<!-- <menuitem id="menu_action_view_cont_voucher_form"--> +<!-- action="action_view_cont_voucher_form" parent="menu_action_other_voucher_list"/>--> - <record model="ir.actions.act_window" id="action_view_jour_sale_voucher_form"> - <field name="name">Journal Sale</field> - <field name="res_model">account.voucher</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form</field> - <field name="view_id" eval="view_voucher_tree"/> - <field name="domain">[('type','=','journal_sale_vou')]</field> - <field name="context">{'type':'journal_sale_vou'}</field> - </record> - <menuitem id="menu_action_view_jour_sale_voucher_form" - action="action_view_jour_sale_voucher_form" parent="menu_action_other_voucher_list"/> +<!-- <record model="ir.actions.act_window" id="action_view_jour_sale_voucher_form">--> +<!-- <field name="name">Journal Sale</field>--> +<!-- <field name="res_model">account.voucher</field>--> +<!-- <field name="view_type">form</field>--> +<!-- <field name="view_mode">tree,form</field>--> +<!-- <field name="view_id" eval="view_voucher_tree"/>--> +<!-- <field name="domain">[('type','=','journal_sale_vou')]</field>--> +<!-- <field name="context">{'type':'journal_sale_vou'}</field>--> +<!-- </record>--> +<!-- <menuitem id="menu_action_view_jour_sale_voucher_form"--> +<!-- action="action_view_jour_sale_voucher_form" parent="menu_action_other_voucher_list"/>--> - <record model="ir.actions.act_window" id="action_view_jour_pur_voucher_form"> - <field name="name">Journal Purchase</field> - <field name="res_model">account.voucher</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form</field> - <field name="view_id" eval="view_voucher_tree"/> - <field name="domain">[('type','=','journal_pur_voucher')]</field> - <field name="context">{'type':'journal_pur_voucher'}</field> - </record> - <menuitem id="menu_action_view_jour_pur_voucher_form" - action="action_view_jour_pur_voucher_form" parent="menu_action_other_voucher_list"/> +<!-- <record model="ir.actions.act_window" id="action_view_jour_pur_voucher_form">--> +<!-- <field name="name">Journal Purchase</field>--> +<!-- <field name="res_model">account.voucher</field>--> +<!-- <field name="view_type">form</field>--> +<!-- <field name="view_mode">tree,form</field>--> +<!-- <field name="view_id" eval="view_voucher_tree"/>--> +<!-- <field name="domain">[('type','=','journal_pur_voucher')]</field>--> +<!-- <field name="context">{'type':'journal_pur_voucher'}</field>--> +<!-- </record>--> +<!-- <menuitem id="menu_action_view_jour_pur_voucher_form"--> +<!-- action="action_view_jour_pur_voucher_form" parent="menu_action_other_voucher_list"/>--> - <record model="ir.actions.act_window" id="action_view_jour_voucher_form"> - <field name="name">Journal Voucher</field> - <field name="res_model">account.voucher</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form</field> - <field name="view_id" eval="view_voucher_tree"/> - <field name="domain">[('type','=','journal_voucher')]</field> - <field name="context">{'type':'journal_voucher'}</field> - </record> - <menuitem id="menu_action_view_jour_voucher_form" - action="action_view_jour_voucher_form" parent="menu_action_other_voucher_list"/> +<!-- <record model="ir.actions.act_window" id="action_view_jour_voucher_form">--> +<!-- <field name="name">Journal Voucher</field>--> +<!-- <field name="res_model">account.voucher</field>--> +<!-- <field name="view_type">form</field>--> +<!-- <field name="view_mode">tree,form</field>--> +<!-- <field name="view_id" eval="view_voucher_tree"/>--> +<!-- <field name="domain">[('type','=','journal_voucher')]</field>--> +<!-- <field name="context">{'type':'journal_voucher'}</field>--> +<!-- </record>--> +<!-- <menuitem id="menu_action_view_jour_voucher_form"--> +<!-- action="action_view_jour_voucher_form" parent="menu_action_other_voucher_list"/>--> <record model="ir.ui.view" id="view_account_journal_form_inherit"> <field name="name">account.journal.form.inherit</field> diff --git a/addons/account_voucher_payment/account_voucher_payment.py b/addons/account_voucher_payment/account_voucher_payment.py index 3d08ad9e1f3..1cd1da98208 100755 --- a/addons/account_voucher_payment/account_voucher_payment.py +++ b/addons/account_voucher_payment/account_voucher_payment.py @@ -205,11 +205,11 @@ class account_voucher(osv.osv): account_voucher() -class VoucherLine(osv.osv): +class account_voucher_line(osv.osv): _inherit = 'account.voucher.line' def default_get(self, cr, uid, fields, context={}): - data = super(VoucherLine, self).default_get(cr, uid, fields, context) + data = super(account_voucher_line, self).default_get(cr, uid, fields, context) self.voucher_context = context return data @@ -217,9 +217,8 @@ class VoucherLine(osv.osv): 'invoice_id' : fields.many2one('account.invoice','Invoice'), } - def move_line_get_item(self, cr, uid, line, context={}): - res = super(VoucherLine, self).move_line_get_item(cr, uid, line, context) + res = super(account_voucher_line, self).move_line_get_item(cr, uid, line, context) res['invoice'] = line.invoice_id or False return res @@ -262,18 +261,13 @@ class VoucherLine(osv.osv): return { 'value' : {'type' : type, 'amount':balance} } - -VoucherLine() - - +account_voucher_line() class account_invoice(osv.osv): _inherit = "account.invoice" def action_cancel(self, cr, uid, ids, *args): - res = super(account_invoice, self).action_cancel(cr, uid, ids, *args) - invoices = self.read(cr, uid, ids, ['move_id']) voucher_db = self.pool.get('account.voucher') voucher_ids = voucher_db.search(cr, uid, []) @@ -281,7 +275,6 @@ class account_invoice(osv.osv): move_db = self.pool.get('account.move') move_ids = move_db.search(cr, uid, []) move_obj = move_db.browse(cr, uid, move_ids) - return res account_invoice() diff --git a/addons/analytic_journal_billing_rate/i18n/id.po b/addons/analytic_journal_billing_rate/i18n/id.po index 0ba7e87a53c..d8e269a7cb4 100644 --- a/addons/analytic_journal_billing_rate/i18n/id.po +++ b/addons/analytic_journal_billing_rate/i18n/id.po @@ -7,30 +7,31 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-09 13:44+0000\n" -"Last-Translator: <>\n" +"PO-Revision-Date: 2010-05-28 03:01+0000\n" +"Last-Translator: Abdul Munif Hanafi <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n" +"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_journal_billing_rate #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML tidak sah untuk Menampilkan Arsitektur!" #. module: analytic_journal_billing_rate #: field:analytic_journal_rate_grid,journal_id:0 msgid "Analytic Journal" -msgstr "" +msgstr "Jurnal Analisis" #. module: analytic_journal_billing_rate #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" msgstr "" +"Nama Objek harus berawalan dengan x_ dan tidak mengandung karakter khusus !" #. module: analytic_journal_billing_rate #: view:analytic_journal_rate_grid:0 @@ -40,7 +41,7 @@ msgstr "" #. module: analytic_journal_billing_rate #: field:analytic_journal_rate_grid,account_id:0 msgid "Analytic Account" -msgstr "" +msgstr "Akun Analisis" #. module: analytic_journal_billing_rate #: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid diff --git a/addons/base_setup/i18n/id.po b/addons/base_setup/i18n/id.po index 33b0888c25e..7c3ff6f08b5 100644 --- a/addons/base_setup/i18n/id.po +++ b/addons/base_setup/i18n/id.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-16 11:35+0000\n" -"Last-Translator: <>\n" +"PO-Revision-Date: 2010-05-28 02:39+0000\n" +"Last-Translator: Abdul Munif Hanafi <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n" +"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_setup @@ -21,7 +21,7 @@ msgstr "" #: wizard_field:base_setup.base_setup,init,city:0 #: wizard_field:base_setup.base_setup,update,city:0 msgid "City" -msgstr "" +msgstr "Kota" #. module: base_setup #: wizard_view:base_setup.base_setup,finish:0 @@ -35,12 +35,12 @@ msgstr "" #: wizard_field:base_setup.base_setup,init,zip:0 #: wizard_field:base_setup.base_setup,update,zip:0 msgid "Zip code" -msgstr "" +msgstr "Kode pos" #. module: base_setup #: wizard_view:base_setup.base_setup,init:0 msgid "Select a Profile" -msgstr "" +msgstr "Pilih sebuah profil" #. module: base_setup #: wizard_view:base_setup.base_setup,company:0 @@ -70,14 +70,14 @@ msgstr "" #: wizard_button:base_setup.base_setup,company,update:0 #: wizard_button:base_setup.base_setup,init,company:0 msgid "Next" -msgstr "" +msgstr "Berikutnya" #. module: base_setup #: wizard_field:base_setup.base_setup,company,email:0 #: wizard_field:base_setup.base_setup,init,email:0 #: wizard_field:base_setup.base_setup,update,email:0 msgid "E-mail" -msgstr "" +msgstr "E-mail" #. module: base_setup #: wizard_field:base_setup.base_setup,company,state_id:0 @@ -96,7 +96,7 @@ msgstr "" #: wizard_field:base_setup.base_setup,init,profile:0 #: wizard_field:base_setup.base_setup,update,profile:0 msgid "Profile" -msgstr "" +msgstr "Profil" #. module: base_setup #: wizard_field:base_setup.base_setup,company,rml_footer1:0 @@ -115,7 +115,7 @@ msgstr "" #. module: base_setup #: wizard_view:base_setup.base_setup,company:0 msgid "General Information" -msgstr "" +msgstr "Informasi Umum" #. module: base_setup #: wizard_field:base_setup.base_setup,company,street2:0 @@ -134,7 +134,7 @@ msgstr "" #: wizard_field:base_setup.base_setup,init,phone:0 #: wizard_field:base_setup.base_setup,update,phone:0 msgid "Phone" -msgstr "" +msgstr "Telepon" #. module: base_setup #: wizard_view:base_setup.base_setup,company:0 @@ -146,7 +146,7 @@ msgstr "" #: wizard_field:base_setup.base_setup,init,name:0 #: wizard_field:base_setup.base_setup,update,name:0 msgid "Company Name" -msgstr "" +msgstr "Nama Perusahaan" #. module: base_setup #: help:base_setup.base_setup,company,rml_footer2:0 @@ -163,7 +163,7 @@ msgstr "" #: wizard_field:base_setup.base_setup,init,country_id:0 #: wizard_field:base_setup.base_setup,update,country_id:0 msgid "Country" -msgstr "" +msgstr "Negara" #. module: base_setup #: wizard_view:base_setup.base_setup,company:0 @@ -173,7 +173,7 @@ msgstr "" #: model:ir.actions.wizard,name:base_setup.action_wizard_setup #: model:ir.actions.wizard,name:base_setup.wizard_base_setup msgid "Setup" -msgstr "" +msgstr "Atur" #. module: base_setup #: help:base_setup.base_setup,company,rml_footer1:0 @@ -193,12 +193,12 @@ msgstr "" #. module: base_setup #: wizard_button:base_setup.base_setup,update,finish:0 msgid "Install" -msgstr "" +msgstr "Pasang" #. module: base_setup #: wizard_view:base_setup.base_setup,finish:0 msgid "Installation Done" -msgstr "" +msgstr "Pemasangan Selesai" #. module: base_setup #: help:base_setup.base_setup,company,rml_header1:0 @@ -234,7 +234,7 @@ msgstr "" #: wizard_field:base_setup.base_setup,init,street:0 #: wizard_field:base_setup.base_setup,update,street:0 msgid "Street" -msgstr "" +msgstr "Jalan" #. module: base_setup #: wizard_button:base_setup.base_setup,finish,menu:0 @@ -244,14 +244,14 @@ msgstr "" #. module: base_setup #: wizard_button:base_setup.base_setup,init,menu:0 msgid "Cancel" -msgstr "" +msgstr "Batal" #. module: base_setup #: wizard_field:base_setup.base_setup,company,logo:0 #: wizard_field:base_setup.base_setup,init,logo:0 #: wizard_field:base_setup.base_setup,update,logo:0 msgid "Logo" -msgstr "" +msgstr "Lambang" #. module: base_setup #: model:ir.module.module,shortdesc:base_setup.module_meta_information @@ -262,4 +262,4 @@ msgstr "" #: wizard_button:base_setup.base_setup,company,init:0 #: wizard_button:base_setup.base_setup,update,company:0 msgid "Previous" -msgstr "" +msgstr "Sebelumnya" diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index c65ee0fd285..da480d21dc0 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -9,7 +9,7 @@ <field name="model">crm.lead.report</field> <field name="type">tree</field> <field name="arch" type="xml"> - <tree string="Leads"> + <tree string="Leads Analysis"> <field name="name" invisible="1"/> <field name="month" invisible="1"/> <field name="section_id" invisible="1"/> @@ -34,7 +34,7 @@ <field name="model">crm.lead.report</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Cases"> + <form string="Leads Analysis"> <field name="name" select="1"/> <field name="month" select="1"/> <field name="user_id" select="1"/> @@ -54,7 +54,7 @@ <field name="model">crm.lead.report</field> <field name="type">graph</field> <field name="arch" type="xml"> - <graph orientation="horizontal" string="Leads" type="bar"> + <graph orientation="horizontal" string="Leads Analysis" type="bar"> <field name="state"/> <field name="nbr" operator="+"/> <field group="True" name="user_id"/> @@ -69,103 +69,69 @@ <field name="model">crm.lead.report</field> <field name="type">search</field> <field name="arch" type="xml"> - <search string="Search"> - <group col="16" colspan="8"> - <!-- <filter string="This Year" name="This Year" icon="terp-hr" - domain="[('name','=',time.localtime()[0])]"/>--> - <filter string="This Year" icon="terp-hr" + <search string="Leads Analysis"> + <group col="16" colspan="8"> + <filter string="Last 365 Days" icon="gtk-media-rewind" domain="[('create_date','<=', time.strftime('%%Y-%%m-%%d')), ('create_date','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/> - - <!-- <filter string="This Month" name="This Year" icon="terp-hr" - domain="[('month','=',time.strftime('%%m'))]" />--> - <filter string="This Month" icon="terp-hr" name="This Month" - domain="[('create_date','<=', time.strftime('%%Y-%%m-%%d')), ('create_date','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/> - - <filter icon="gtk-media-rewind" string="7 Days" separator="1" + <filter string="Last 30 Days" icon="gtk-media-rewind" name="This Month" + domain="[('create_date','<=', time.strftime('%%Y-%%m-%%d')), ('create_date','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/> + <filter icon="gtk-media-rewind" string="7 Days" separator="1" domain="[('create_date','<=', time.strftime('%%Y-%%m-%%d')), ('create_date','>',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/> - <separator orientation="vertical" /> - <filter icon="terp-hr" + <filter icon="terp-crm" string="Draft" domain="[('state','=','draft')]"/> - <filter icon="terp-hr" + <filter icon="terp-crm" string="Open" domain="[('state','=','open')]"/> - <filter icon="terp-hr" + <filter icon="terp-crm" string="Pending" domain="[('state','=','pending')]"/> - <separator orientation="vertical" /> <field name="section_id" default="context.get('section_id', False)" widget="selection" context="{'invisible_section': False}"> - - <filter icon="terp-crm" - context="{'invisible_section': False}" - domain="[('section_id.user_id','=',uid)]" - help="My section" /> - + <filter icon="terp-crm" + context="{'invisible_section': False}" + domain="[('section_id.user_id','=',uid)]" + help="My section" /> </field> - <field name="company_id" widget="selection" groups="base.group_multi_company"> - <filter icon="terp-crm" - context="{'invisible_section': False}" - domain="[('section_id.user_id.company_id','=',uid)]" - help="My company"/> - </field> - <field name="user_id" select="1" widget="selection"> <filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" /> </field> </group> <newline/> <group expand="1" string="Group By..."> - <filter string="User" name="User" icon="terp-sale" + <filter string="User" name="User" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}" /> - - <filter string="Company" icon="terp-sale" + <filter string="Company" icon="terp-crm" domain="[]" context="{'group_by':'company_id'}" /> - - <filter string="Section" icon="terp-sale" + <filter string="Section" icon="terp-crm" domain="[]" context="{'group_by':'section_id'}" /> - <separator orientation="vertical" /> - <filter string="State" icon="terp-sale" + <filter string="State" icon="terp-crm" domain="[]" context="{'group_by':'state'}" /> - - <filter string="Stage" icon="terp-sale" domain="[]" + <filter string="Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}" /> - - <filter string="Category" icon="terp-sale" + <filter string="Category" icon="terp-crm" domain="[]" context="{'group_by':'categ_id'}" /> - <separator orientation="vertical" /> - <filter string="Day" icon="terp-sale" + <filter string="Day" icon="terp-crm" domain="[]" context="{'group_by':'day'}"/> - - <filter string="Month" icon="terp-sale" + <filter string="Month" icon="terp-crm" domain="[]" context="{'group_by':'month'}" /> - - <filter string="Year" icon="terp-sale" + <filter string="Year" icon="terp-crm" domain="[]" context="{'group_by':'name'}" /> - </group> <newline/> <group expand="0" string="Extended options..." groups="base.group_extended"> - - <filter icon="terp-sale" - string="Done" - domain="[('state','=','done')]"/> - <filter icon="terp-sale" - string="Cancel" - domain="[('state','=','cancel')]"/> - <group> - <separator orientation="vertical"/> - <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/> - <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/> - </group> + <field name="state"/> + <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/> + <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/> + <field name="company_id" widget="selection" groups="base.group_multi_company"/> </group> </search> </field> @@ -199,7 +165,7 @@ <!-- Leads by user and section Action --> <record id="action_report_crm_lead" model="ir.actions.act_window"> - <field name="name">Leads</field> + <field name="name">Leads Analysis</field> <field name="res_model">crm.lead.report</field> <field name="view_type">form</field> <field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field> @@ -246,7 +212,7 @@ <field name="act_window_id" ref="action_report_crm_opportunity"/> </record> - <menuitem name="Leads" id="menu_report_crm_leads_tree" + <menuitem name="Leads Analysis" id="menu_report_crm_leads_tree" groups="base.group_extended" parent="base.next_id_64" action="action_report_crm_lead" /> diff --git a/addons/crm_profiling/i18n/pt.po b/addons/crm_profiling/i18n/pt.po index 5c073f17dd1..90a457d5732 100644 --- a/addons/crm_profiling/i18n/pt.po +++ b/addons/crm_profiling/i18n/pt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-12-04 22:45+0000\n" -"Last-Translator: Paulino <Unknown>\n" +"PO-Revision-Date: 2010-05-28 02:23+0000\n" +"Last-Translator: cmsa <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n" +"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm_profiling @@ -86,7 +86,7 @@ msgstr "Nome do questionário" #. module: crm_profiling #: view:res.partner:0 msgid "Use a questionnaire" -msgstr "Usar um que questionário" +msgstr "Usar um questionário" #. module: crm_profiling #: constraint:ir.ui.view:0 diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml index 921d8b43a2b..44c20ebbe16 100644 --- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml +++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml @@ -42,33 +42,37 @@ <field name="arch" type="xml"> <search string="Evaluations"> <group> - <filter icon="terp-hr" string="This Year" - domain="[('create_date','<=', time.strftime('%%Y-%%m-%%d')),('create_date','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" - help="Tasks performed in this year"/> - <filter icon="terp-hr" string="This Month" - name="month" - domain="[('create_date','<=', time.strftime('%%Y-%%m-%%d')), ('create_date','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" - help="Tasks performed in this month"/> + <filter icon="gtk-media-rewind" string="Last 365 Days" + domain="[('create_date','<=', time.strftime('%%Y-%%m-%%d')),('create_date','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" + help="Tasks performed in last 365 days"/> + <filter icon="gtk-media-rewind" string="Last 30 Days" + name="month" + domain="[('create_date','<=', time.strftime('%%Y-%%m-%%d')), ('create_date','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" + help="Tasks performed in last 30 days"/> <filter icon="gtk-media-rewind" - string=" 7 Days " - separator="1" - domain="[('create_date','<=', time.strftime('%%Y-%%m-%%d')), ('create_date','>',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" - help="Tasks during last 7 days"/> + string=" 7 Days " + separator="1" + domain="[('create_date','<=', time.strftime('%%Y-%%m-%%d')), ('create_date','>',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" + help="Tasks during last 7 days"/> <separator orientation="vertical"/> <filter string="Draft" - icon="terp-hr" - domain="[('state','=','draft')]" - help = "Draft Evaluations"/> + icon="terp-hr" + domain="[('state','=','draft')]" + help = "Draft Evaluations"/> <filter string="Plan In Progress" - icon="terp-hr" - domain="[('state', '=' ,'wait')]" - help = "In progress Evaluations"/> + icon="terp-hr" + domain="[('state', '=' ,'wait')]" + help = "In progress Evaluations"/> <filter string="Final Validation" - icon="terp-hr" - domain="[('state','=','progress')]" - help = "Final Validation Evaluations"/> + icon="terp-hr" + domain="[('state','=','progress')]" + help = "Final Validation Evaluations"/> + <filter icon="terp-hr" + string="Done" + domain="[('state','=','done')]"/> <separator orientation="vertical"/> <field name="employee_id" widget="selection"/> + <field name="plan_id" widget="selection"/> </group> <newline/> <group expand="1" string="Group By..."> @@ -84,20 +88,11 @@ </group> <newline/> <group expand="0" string="Extended options..." groups="base.group_extended"> - <filter icon="terp-hr" - string="Done" - domain="[('state','=','done')]"/> - <filter icon="terp-hr" - string="Cancelled" - domain="[('state','=','cancel')]"/> - <separator orientation="vertical"/> <field name="rating"/> - <field name="plan_id" widget="selection"/> <separator orientation="vertical"/> <field name="deadline"/> - <newline/> - <field name="create_date"/> - <field name="closed"/> + <separator orientation="vertical"/> + <field name="state"/> </group> </search> </field> diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py index ae13b0ce67b..83113558c43 100644 --- a/addons/hr_expense/__openerp__.py +++ b/addons/hr_expense/__openerp__.py @@ -54,6 +54,7 @@ 'demo_xml': ['hr_expense_demo.xml', # 'hr.expense.expense.csv' ], + 'test': ['test/test_hr_expense.yml'], 'installable': True, 'active': False, 'certificate': '0062479841789', diff --git a/addons/hr_expense/test/test_hr_expense.yml b/addons/hr_expense/test/test_hr_expense.yml new file mode 100644 index 00000000000..70e2bfb874d --- /dev/null +++ b/addons/hr_expense/test/test_hr_expense.yml @@ -0,0 +1,107 @@ +- | + In order to test hr_expenses for OpenERP, I create expense for employee and manage employee's expenses. +- | + Creating unit of measure category "Working Time". +- + !record {model: product.uom.categ, id: product_uom_categ_workingtime0}: + name: Working Time. + +- | + Given that I have employee "Marc John" and his address. +- + !record {model: hr.employee, id: hr.employee1}: + address_home_id: base.res_partner_address_1 + address_id: base.main_address +- | + I create product unit of measure "Hour". +- + !record {model: product.uom, id: product_uom_hour0}: + category_id: 'product_uom_categ_workingtime0' + factor: 8.0 + name: Hour + rounding: 0.01 +- | + Creating a product "travel" and select uom "Hour" and category "Working Time". +- + !record {model: product.product, id: product_product_travel0}: + categ_id: product.product_category_services + cost_method: standard + hr_expense_ok: 1 + list_price: 800.0 + mes_type: fixed + name: Travel + procure_method: make_to_stock + standard_price: 700.0 + supply_method: buy + type: product + uom_id: 'product_uom_hour0' + uom_po_id: 'product_uom_hour0' + volume: 0.0 + warranty: 0.0 + weight: 0.0 + weight_net: 0.0 + +- | + Now I create Expense "September Expenses" for Marc John.And select product "travel". +- + !record {model: hr.expense.expense, id: hr_expense_expense_september0}: + company_id: base.main_company + currency_id: base.EUR + date: '2010-05-05' + employee_id: hr.employee1 + name: September Expenses + line_ids: + - date_value: '2010-05-27' + name: Travel + product_id: 'product_product_travel0' + sequence: 0.0 + uom_id: product.product_uom_unit + unit_amount: 700.0 + user_id: base.user_root +- | + I check that expenses on "draft" state. +- + !assert {model: hr.expense.expense, id: hr_expense_expense_september0}: + - state == 'draft' +- | + I confirm this expenses by click on "Confirm" button. +- + !workflow {model: hr.expense.expense, action: confirm, ref: hr_expense_expense_september0} + +- | + I check that state is "Waiting Confirmation". +- + !assert {model: hr.expense.expense, id: hr_expense_expense_september0}: + - state == 'confirm' +- | + I accept this expense by click on "Accept" button. +- + !workflow {model: hr.expense.expense, action: validate, ref: hr_expense_expense_september0} + +- | + I invoiced this expenses by click on "Invoice" button. +- + !workflow {model: hr.expense.expense, action: invoice, ref: hr_expense_expense_september0} + +- | + I check that state is "Invoiced" +- + !assert {model: hr.expense.expense, id: hr_expense_expense_september0}: + - state == 'invoiced' +- | + Now I check that Invoice is created for that expenses. +- + !python {model: hr.expense.expense}: | + exp = self.browse(cr, uid, [ref('hr_expense_expense_september0')])[0] + invoice_obj = self.pool.get('account.invoice') + invoice_ids = invoice_obj.search(cr, uid, [('partner_id', '=', exp.employee_id.address_id.partner_id.id)]) + invoice_id = invoice_obj.browse(cr, uid, invoice_ids)[0] + + for invoice in invoice_id.invoice_line: + product = invoice.product_id.id + + for line in exp.line_ids: + product_exp = line.product_id.id + assert product == product_exp + assert exp.id == invoice_id.id + diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml index 9c9d4e96c14..5a7f8529cc0 100755 --- a/addons/marketing_campaign/marketing_campaign_view.xml +++ b/addons/marketing_campaign/marketing_campaign_view.xml @@ -1,8 +1,8 @@ <?xml version="1.0"?> <openerp> - <data> - <menuitem name="Direct Marketing" id="menu_marketing" parent="base.menu_base_partner"/> - <!-- + <data> + <menuitem name="Direct Marketing" id="menu_marketing" parent="base.menu_base_partner"/> + <!-- ====================== Marketing Campaign ====================== @@ -14,35 +14,35 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Campaign"> - <group colspan="4"> - <field name="name" select="1"/> - <field name="object_id" select="1"/> - <field name="mode"/> - <field name="fixed_cost"/> + <group colspan="4"> + <field name="name" select="1"/> + <field name="object_id" select="1"/> + <field name="mode"/> + <field name="fixed_cost"/> </group> <field name="activity_ids" nolabel = "1" colspan="4" default_get="{'object_id':object_id}"> - <form string="Activities"> - <field name="name" select="1" /> - <field name="object_id" readonly="True"/> - <field name="variable_cost" select="1"/> - <field name="start"/> - <field name="condition" colspan="4"/> - <newline/> - <field name="type" colspan="4"/> - <group colspan="4" attrs="{'invisible':[('type','!=','email')]}" > - <field name="email_template_id" attrs="{'required':[('type','=','email')]}" /> - </group> - <group colspan="4" attrs="{'invisible':[('type','!=','paper')]}" > - <field name="report_id" attrs="{'required':[('type','=','paper')]}"/> - <field name="report_directory_id" attrs="{'required':[('type','=','paper')]}" /> - </group> - <group colspan="4" attrs="{'invisible':[('type','!=','action')]}" > - <field name="server_action_id" attrs="{'required':[('type','=','action')]}" /> - </group> - <group colspan="4" attrs="{'invisible':[('type','!=','subcampaign')]}" > - <field name="subcampaign_id" attrs="{'required':[('type','=','subcampaign')]}" /> - <field name="subcampaign_segment_id" attrs="{'required':[('type','=','subcampaign')]}" /> - </group> + <form string="Activities"> + <field name="name" select="1" /> + <field name="object_id" readonly="True"/> + <field name="variable_cost" select="1"/> + <field name="start"/> + <field name="condition" colspan="4"/> + <newline/> + <field name="type" colspan="4"/> + <group colspan="4" attrs="{'invisible':[('type','!=','email')]}" > + <field name="email_template_id" attrs="{'required':[('type','=','email')]}" /> + </group> + <group colspan="4" attrs="{'invisible':[('type','!=','paper')]}" > + <field name="report_id" attrs="{'required':[('type','=','paper')]}"/> + <field name="report_directory_id" attrs="{'required':[('type','=','paper')]}" /> + </group> + <group colspan="4" attrs="{'invisible':[('type','!=','action')]}" > + <field name="server_action_id" attrs="{'required':[('type','=','action')]}" /> + </group> + <group colspan="4" attrs="{'invisible':[('type','!=','subcampaign')]}" > + <field name="subcampaign_id" attrs="{'required':[('type','=','subcampaign')]}" /> + <field name="subcampaign_segment_id" attrs="{'required':[('type','=','subcampaign')]}" /> + </group> <field name="to_ids" nolabel="1" colspan="4" mode="tree" default_get="{'type_id':'activity_from_id','activity_id':active_id or False}"> <form string="Out Transitions" > <field name="activity_from_id" readonly="True"/> @@ -71,28 +71,28 @@ <field name="interval_type"/> </tree> </field> - </form> - <tree string="All Activities"> - <field name="name" select="1"/> - <field name="object_id"/> - <field name="start"/> - <field name="condition"/> - <field name="variable_cost" select="1"/> - <field name="type"/> - <field name="report_id"/> - <field name="to_ids"/> - <field name="subcampaign_id"/> - <field name="subcampaign_segment_id"/> - </tree> - </field> - <separator string="Status" colspan="4" /> + </form> + <tree string="Activities"> + <field name="name" select="1"/> + <field name="object_id"/> + <field name="start"/> + <field name="condition"/> + <field name="variable_cost" select="1"/> + <field name="type"/> + <field name="report_id"/> + <field name="to_ids"/> + <field name="subcampaign_id"/> + <field name="subcampaign_segment_id"/> + </tree> + </field> + <separator string="Status" colspan="4" /> <group col="10" colspan="4"> <field name="state" readonly="1" select="2" nolabel="1"/> <button name="state_running_set" string="Run" states="draft" icon="gtk-apply"/> <button name="state_done_set" string="Done" states="running" icon="gtk-ok"/> <button name="state_cancel_set" string="Cancelled" states="running" icon="gtk-cancel"/> </group> - </form> + </form> </field> </record> @@ -101,12 +101,12 @@ <field name="model">marketing.campaign</field> <field name="type">tree</field> <field name="arch" type="xml"> - <tree string="All Campaigns"> - <field name="name" select="1"/> - <field name="object_id" select="1"/> - <field name="mode"/> - <field name="fixed_cost"/> - <field name="state"/> + <tree string="Campaigns"> + <field name="name" select="1"/> + <field name="object_id" select="1"/> + <field name="mode"/> + <field name="fixed_cost"/> + <field name="state"/> </tree> </field> </record> @@ -116,20 +116,20 @@ <field name="model">marketing.campaign</field> <field name="type">diagram</field> <field name="arch" type="xml"> - <diagram string="Campaign Editor"> - <node object="marketing.campaign.activity" shape="rectangle:type=='subcampaign'" bgcolor="gray:start==True"> - <field name="name"/> - <field name="type"/> - <field name="start" invisible="1"/> - <field name="condition"/> - </node> - <arrow object="marketing.campaign.transition" source="activity_from_id" destination="activity_to_id" label="['interval_type']"> - <field name="activity_from_id"/> - <field name="activity_to_id"/> - <field name="interval_nbr"/> - <field name="interval_type"/> - </arrow> - </diagram> + <diagram string="Campaign Editor"> + <node object="marketing.campaign.activity" shape="rectangle:type=='subcampaign'" bgcolor="gray:start==True"> + <field name="name"/> + <field name="type"/> + <field name="start" invisible="1"/> + <field name="condition"/> + </node> + <arrow object="marketing.campaign.transition" source="activity_from_id" destination="activity_to_id" label="['interval_type']"> + <field name="activity_from_id"/> + <field name="activity_to_id"/> + <field name="interval_nbr"/> + <field name="interval_type"/> + </arrow> + </diagram> </field> </record> @@ -157,7 +157,7 @@ </record> <record model="ir.actions.act_window" id="action_marketing_campaign_form"> - <field name="name">All Campaigns</field> + <field name="name">Campaigns</field> <field name="type">ir.actions.act_window</field> <field name="res_model">marketing.campaign</field> <field name="view_type">form</field> @@ -169,8 +169,8 @@ </record> <menuitem id="menu_marketing_campaign_form" parent="menu_marketing" action="action_marketing_campaign_form" sequence="10" /> - - <!-- + + <!-- ====================== Marketing Segments ====================== @@ -182,20 +182,20 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Segments"> - <group colspan="4"> - <field name="name" select="1" colspan="4"/> - <newline/> - <field name="campaign_id" select="1"/> - <field name="object_id" select="1" readonly="True"/> - <newline/> - <field name="ir_filter_id" select="1"/> - <newline/> - <field name="date_run" attrs="{'readonly':[('date_run','!=',False),('state','=','running')]}"/> - <field name="date_done"/> - <separator string="Synchronization" colspan="4" /> - <field name="sync_last_date"/> - <field name="sync_mode" required="True"/> - </group> + <group colspan="4"> + <field name="name" select="1" colspan="4"/> + <newline/> + <field name="campaign_id" select="1"/> + <field name="object_id" select="1" readonly="True"/> + <newline/> + <field name="ir_filter_id" select="1"/> + <newline/> + <field name="date_run" attrs="{'readonly':[('date_run','!=',False),('state','=','running')]}"/> + <field name="date_done"/> + <separator string="Synchronization" colspan="4" /> + <field name="sync_last_date"/> + <field name="sync_mode" required="True"/> + </group> <separator string="Status" colspan="4" /> <group col="10" colspan="4"> <field name="state" readonly="1" select="2" nolabel="1"/> @@ -212,7 +212,7 @@ <field name="model">marketing.campaign.segment</field> <field name="type">tree</field> <field name="arch" type="xml"> - <tree string="All Segments"> + <tree string="Segments"> <field name="name" select="1"/> <field name="campaign_id" select="1"/> <field name="object_id" select="1" /> @@ -252,7 +252,7 @@ </record> + <record model="ir.actions.act_window" id="action_marketing_campaign_segment_form"> - <field name="name">All Segments</field> + <field name="name">Segments</field> <field name="type">ir.actions.act_window</field> <field name="res_model">marketing.campaign.segment</field> <field name="view_type">form</field> @@ -263,8 +263,8 @@ </record> <menuitem id="menu_marketing_campaign_segment_form" parent="menu_marketing" action="action_marketing_campaign_segment_form" sequence="20" /> - - <!-- + + <!-- ====================== Marketing Activities ====================== @@ -333,23 +333,23 @@ <field name="model">marketing.campaign.activity</field> <field name="type">tree</field> <field name="arch" type="xml"> - <tree string="All Activities"> - <field name="name" select="1"/> - <field name="campaign_id" select="1"/> - <field name="start"/> - <field name="object_id"/> - <field name="condition"/> - <field name="type"/> - <field name="report_id"/> - <field name="to_ids" /> - <field name="subcampaign_id"/> - <field name="subcampaign_segment_id"/> + <tree string="Activities"> + <field name="name" select="1"/> + <field name="campaign_id" select="1"/> + <field name="start"/> + <field name="object_id"/> + <field name="condition"/> + <field name="type"/> + <field name="report_id"/> + <field name="to_ids" /> + <field name="subcampaign_id"/> + <field name="subcampaign_segment_id"/> </tree> </field> </record> <record model="ir.actions.act_window" id="action_marketing_campaign_activity_form"> - <field name="name">All Activities</field> + <field name="name">Activities</field> <field name="type">ir.actions.act_window</field> <field name="res_model">marketing.campaign.activity</field> <field name="view_type">form</field> @@ -357,7 +357,7 @@ <field name="view_id" ref="view_marketing_campaign_activity_tree"/> </record> - <!--menuitem id="menu_marketing_campaign_activity_form" parent="menu_marketing" action="action_marketing_campaign_activity_form" sequence="3" /--> + <!--menuitem id="menu_marketing_campaign_activity_form" parent="menu_marketing" action="action_marketing_campaign_activity_form" sequence="3" /--> <!-- ====================== @@ -370,7 +370,7 @@ <field name="model">marketing.campaign.workitem</field> <field name="type">tree</field> <field name="arch" type="xml"> - <tree string="All Workitems"> + <tree string="Workitems"> <field name="segment_id"/> <field name="activity_id" /> <field name="object_id"/> @@ -427,7 +427,7 @@ </record> <record model="ir.actions.act_window" id="action_marketing_campaign_workitem"> - <field name="name">All Workitems</field> + <field name="name">Workitems</field> <field name="type">ir.actions.act_window</field> <field name="res_model">marketing.campaign.workitem</field> <field name="view_type">form</field> @@ -439,5 +439,5 @@ <menuitem id="menu_action_marketing_campaign_workitem" parent="menu_marketing" action="action_marketing_campaign_workitem" sequence="30" groups="base.group_extended"/> - </data> + </data> </openerp> diff --git a/addons/project/project.py b/addons/project/project.py index bdf7e30837e..61720675f49 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -135,6 +135,7 @@ class project(osv.osv): 'warn_header': fields.text('Mail Header', help="Header added at the beginning of the email for the warning message sent to the customer when a task is closed."), 'warn_footer': fields.text('Mail Footer', help="Footer added at the beginning of the email for the warning message sent to the customer when a task is closed."), 'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages'), + 'project_escalation_id' : fields.many2one('project.project','Project Escalation', help='If any issue is escalated from the current Project, it will be listed under the project selected here.'), } _order = "sequence" _defaults = { @@ -149,11 +150,18 @@ class project(osv.osv): if leave['date_start'] > leave['date']: return False return True - + + def _check_escalation(self, cr, uid, ids): + project_obj = self.browse(cr, uid, ids[0]) + if project_obj.project_escalation_id: + if project_obj.project_escalation_id.id == project_obj.id: + return False + return True + _constraints = [ - (_check_dates, 'Error! project start-date must be lower then project end-date.', ['date_start', 'date']) + (_check_dates, 'Error! project start-date must be lower then project end-date.', ['date_start', 'date']), + (_check_escalation, 'Error! You cannot assign escalation to the same project!', ['project_escalation_id']) ] - def set_template(self, cr, uid, ids, context={}): res = self.setActive(cr, uid, ids, value=False, context=context) return res diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index f22e352d16b..e2f6ae53e3c 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -36,6 +36,7 @@ <separator colspan="2" string="Miscelleanous"/> <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/> <field name="warn_manager"/> + <field name="project_escalation_id"/> </group> <newline/> diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index a56ae9435c3..5955cb810a2 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -55,10 +55,10 @@ <field name="arch" type="xml"> <search string="Tasks Analysis"> <group> - <filter icon="gtk-media-rewind" string="Last 365 Days" + <filter icon="gtk-media-rewind" string=" 365 Days " domain="[('date_start','<=', time.strftime('%%Y-%%m-%%d')),('date_start','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" help="Tasks performed in last 365 Days"/> - <filter icon="gtk-media-rewind" string="Last 30 Days" + <filter icon="gtk-media-rewind" string=" 30 Days " name="month" domain="[('date_start','<=', time.strftime('%%Y-%%m-%%d')), ('date_start','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" help="Tasks performed in last 30 days"/> @@ -103,6 +103,7 @@ domain="[('project_id','=',context.get('project_id', False)]"/> </field> </group> + <newline/> <group expand="1" string="Group By..." colspan="10" col="11"> <filter string="User" name="User" icon="terp-project" context="{'group_by':'user_id'}" /> <filter string="Project" icon="terp-project" context="{'group_by':'project_id'}"/> @@ -247,6 +248,6 @@ <field name="view_mode">graph,tree</field> <field name="view_id" ref="view_task_by_days_vs_planned_hours_graph"/> </record> - + </data> </openerp> diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index b67ef6a849a..795c9883eca 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -112,16 +112,17 @@ class project_issue(osv.osv, crm.crm_case): _columns = { 'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 'id': fields.integer('ID'), - 'name': fields.char('Name', size=128, required=True), - 'create_date': fields.datetime('Creation Date' , readonly=True), - 'write_date': fields.datetime('Update Date' , readonly=True), - 'date_deadline': fields.date('Deadline'), - 'date_closed': fields.datetime('Closed', readonly=True), + 'name': fields.char('Name', size=128, required=True), + 'active': fields.boolean('Active', required=False), + 'create_date': fields.datetime('Creation Date' , readonly=True), + 'write_date': fields.datetime('Update Date' , readonly=True), + 'date_deadline': fields.date('Deadline'), + 'date_closed': fields.datetime('Closed', readonly=True), 'section_id': fields.many2one('crm.case.section', 'Sales Team', \ select=True, help='Sales team to which Case belongs to.\ Define Responsible user and Email account for mail gateway.'), - 'user_id': fields.many2one('res.users', 'Responsible'), - 'partner_id': fields.many2one('res.partner', 'Partner'), + 'user_id': fields.many2one('res.users', 'Responsible'), + 'partner_id': fields.many2one('res.partner', 'Partner'), 'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \ domain="[('partner_id','=',partner_id)]"), 'company_id': fields.many2one('res.company', 'Company'), @@ -163,6 +164,8 @@ class project_issue(osv.osv, crm.crm_case): 'day_close': fields.function(_compute_day, string='Days to Close', \ method=True, multi='day_close', type="float", store=True), 'assigned_to' : fields.many2one('res.users', 'Assigned to'), + 'working_hours_open': fields.float('Working Hours to Open the Issue'), + 'working_hours_close': fields.float('Working Hours to Close the Issue'), } def _get_project(self, cr, uid, context): @@ -172,6 +175,7 @@ class project_issue(osv.osv, crm.crm_case): return False _defaults = { + 'active': lambda *a: 1, 'user_id': crm.crm_case._get_default_user, 'partner_id': crm.crm_case._get_default_partner, 'partner_address_id': crm.crm_case._get_default_partner_address, @@ -260,6 +264,25 @@ class project_issue(osv.osv, crm.crm_case): if not stage.on_change: return {'value':{}} return {'value':{}} + + def case_escalate(self, cr, uid, ids, *args): + """Escalates case to top level + @param self: The object pointer + @param cr: the current row, from the database cursor, + @param uid: the current user’s ID for security checks, + @param ids: List of case Ids + @param *args: Tuple Value for additional Params + """ + res = super(project_issue, self).case_escalate(cr, uid, ids, args) + cases = self.browse(cr, uid, ids) + for case in cases: + data = {} + if case.project_id.project_escalation_id: + data['project_id'] = case.project_id.project_escalation_id.id + else: + raise osv.except_osv(_('Warning !'), _('You cannot escalate this case.\nThe relevant Project has not configured the Escalation Project!')) + self.write(cr, uid, [case.id], data) + return res project_issue() diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 27b72e459ef..9362e858b1e 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -82,8 +82,13 @@ <separator string="Statistics" colspan="2" col="2"/> <field name="day_open"/> <field name="day_close"/> + <field name="working_hours_open" widget="float_time"/> + <field name="working_hours_close" widget="float_time"/> + </group> + <group colspan="2" col="2"> <separator string="References" colspan="2"/> <field name="id"/> + <field name="active"/> </group> <field name="log_ids" nolabel="1" colspan="4"> <tree string="Logs"> diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index e713c479f72..6bb34ea4472 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -36,7 +36,13 @@ class sale_report(osv.osv): ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), 'day': fields.char('Day', size=128, readonly=True), 'product_id':fields.many2one('product.product', 'Product', readonly=True), +<<<<<<< TREE + 'uom_id': fields.many2one('product.uom', 'Default Unit Of Measure', readonly=True), 'product_qty':fields.float('# of Qty', readonly=True), +======= + 'uom_name': fields.char('Default UoM', size=128, readonly=True), + 'product_uom_qty':fields.float('# of Qty', readonly=True), +>>>>>>> MERGE-SOURCE 'partner_id':fields.many2one('res.partner', 'Partner', readonly=True), 'shop_id':fields.many2one('sale.shop', 'Shop', readonly=True), 'company_id':fields.many2one('res.company', 'Company', readonly=True), @@ -71,7 +77,8 @@ class sale_report(osv.osv): to_char(s.date_order, 'MM') as month, to_char(s.date_order, 'YYYY-MM-DD') as day, l.product_id as product_id, - sum(l.product_uom_qty * u.factor) as product_qty, + u.name as uom_name, + sum(l.product_uom_qty * u.factor) as product_uom_qty, s.partner_id as partner_id, s.user_id as user_id, s.shop_id as shop_id, @@ -96,6 +103,7 @@ class sale_report(osv.osv): l.product_uom, s.user_id, pt.categ_id, + u.name, s.state, s.shop_id, s.company_id, diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 2fca6dedd5a..98ae326fc14 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -19,7 +19,8 @@ <field name="product_id" invisible="1"/> <field name="categ_id" invisible="1"/> <field name="nbr" sum="# of Lines"/> - <field name="product_qty" sum="# of Qty"/> + <field name="product_uom_qty" sum="# of Qty"/> + <field name="uom_name" invisible="not context.get('set_visible',False)"/> <field name="price_average" avg="Average Price"/> <field name="price_total" sum="Total Price"/> <field name="delay" avg="Days to Close"/> @@ -50,10 +51,10 @@ <field name="arch" type="xml"> <search string="Sales Analysis"> <group> - <filter icon="gtk-media-rewind" string="Last 365 Days" + <filter icon="gtk-media-rewind" string=" 365 Days " domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" help="Tasks performed in last 365 days"/> - <filter icon="gtk-media-rewind" string="Last 30 Days" + <filter icon="gtk-media-rewind" string=" 30 Days " name="month" domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" help="Tasks performed in last 30 days"/> @@ -78,7 +79,6 @@ help="My Sales" domain="[('user_id','=',uid)]"/> </field> - <field name="company_id" groups="base.group_multi_company" widget="selection"/> </group> <newline/> <group expand="1" string="Group By..." colspan="10" col="12"> @@ -86,7 +86,8 @@ <filter string="Shop" icon="terp-sale" context="{'group_by':'shop_id'}"/> <filter string="Company" icon="terp-sale" groups="base.group_multi_company" context="{'group_by':'company_id'}"/> <separator orientation="vertical"/> - <filter string="Product" icon="terp-sale" context="{'group_by':'product_id'}"/> + <filter string="Product" icon="terp-sale" context="{'group_by':'product_id','set_visible':True}"/> + <filter string="Default UoM" icon="terp-sale" context="{'group_by':'uom_name'}"/> <filter string="Partner" icon="terp-sale" context="{'group_by':'partner_id'}"/> <filter string="State" icon="terp-sale" context="{'group_by':'state'}"/> <separator orientation="vertical"/> @@ -99,28 +100,13 @@ <filter string="Year" icon="terp-sale" context="{'group_by':'year'}"/> </group> <newline/> - <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended"> - <filter icon="terp-sale" string="Shipping Exception" domain="[('state','=','shipping_except')]"/> - <filter icon="terp-sale" string=" Invoice Exception " domain="[('state','=','invoice_except')]"/> + <group expand="0" string="Extended options..." groups="base.group_extended"> + <field name="date"/> <separator orientation="vertical"/> <field name="shop_id" widget="selection"/> - <field name="payment_term" widget="selection"/> - <field name="fiscal_position" widget="selection"/> - <newline/> - <filter icon="terp-sale" string="Manual In Progress" domain="[('state','=','manual')]"/> - <filter icon="terp-sale" string="Done" domain="[('state','=','done')]"/> - <filter icon="terp-sale" string="Cancelled" domain="[('state','=','cancel')]"/> - <separator orientation="vertical"/> - <field name="partner_invoice_id"/> - <field name="partner_order_id"/> - <field name="partner_shipping_id"/> - <separator orientation="vertical"/> - <field name="pricelist_id" widget="selection"/> - <field name="analytic_account_id"/> - <newline/> + <field name="state"/> + <field name="categ_id" widget="selection"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/> - <field name="date"/> - <field name="date_confirm"/> </group> </search> </field> |