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

[MERGE][IMP] account_voucher: restore the previous commit lost changes in some reports of hr payroll.

Browse Source 
bzr revid: vra@tinyerp.com-20101011125646-4qjzb2gr2lbjqe0v
This commit is contained in:
vra
2010-10-11 18:26:46 +05:30
parent ed8aaa066e 6b92fc0fcd
commit 4685282c4b
215 changed files with 1726 additions and 1911 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_unit_test.xml
+8 -1
View File
@@ -14,6 +14,13 @@
<field name="name">Test invoice 1</field>
<field name="address_contact_id" ref="base.res_partner_address_tang"/>
</record>
<record id="test_tax_line" model="account.invoice.tax">
<field name="name">Test Tax</field>
<field name="base">5.00</field>
<field name="amount">100.00</field>
<field name="account_id" ref="account.ova"/>
<field name="invoice_id" ref="test_invoice_1"/>
</record>
<record id="test_invoice_1_line_1" model="account.invoice.line">
<field name="name">Basic computer with Dvorak keyboard and left-handed mouse</field>
<field name="invoice_id" ref="test_invoice_1"/>
@@ -27,7 +34,7 @@
<field name="price_unit">800</field>
<field name="quantity">2</field>
<field name="account_id" ref="account.a_sale"/>
</record>
</record>
<assert id="test_invoice_1" model="account.invoice" string="The currency unit of Test invoice 1 is EUR">
<test expr="currency_id.code">EUR</test>
addons/account/account_view.xml
+11
View File
@@ -236,6 +236,17 @@
</tree>
</field>
</record>
<record id="view_treasory_graph" model="ir.ui.view">
<field name="name">account.treasory.graph</field>
<field name="model">account.account</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Treasory Analysis" type="bar">
<field name="name"/>
<field name="balance" operator="+"/>
</graph>
</field>
</record>
<record id="action_account_form" model="ir.actions.act_window">
<field name="name">Accounts</field>
<field name="res_model">account.account</field>
addons/account/board_account_view.xml
+19 -2
View File
@@ -20,7 +20,22 @@
<field name="view_mode">graph,tree</field>
<field name="domain">[('type','=','income')]</field>
</record>
<record id="action_company_analysis_tree" model="ir.actions.act_window">
<field name="name">Company 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">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
<field name="view_id" ref="account.view_company_analysis_tree"/>
</record>
<record id="action_treasory_graph" model="ir.actions.act_window">
<field name="name">Treasory</field>
<field name="res_model">account.account</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="domain">[('type','=','liquidity')]</field>
<field name="view_id" ref="account.view_treasory_graph"/>
</record>
<record id="board_account_form" model="ir.ui.view">
<field name="name">board.account.form</field>
<field name="model">board.board</field>
@@ -30,10 +45,12 @@
<hpaned>
<child1>
<action colspan="4" height="160" width="400" name="%(account.action_invoice_tree1)d" string="Draft Customer Invoices" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
<action colspan="4" height="160" width="400" name="%(action_company_analysis_tree)d" string="Company Analysis" />
</child1>
<child2>
<action colspan="4" height="220" name="%(action_treasory_graph)d" string="Treasory"/>
<action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged receivables"/>
<action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/>
<!-- <action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/> -->
</child2>
</hpaned>
</form>
addons/account/project/report/cost_ledger.rml
+14 -32
View File
@@ -181,13 +181,10 @@
<para style="terp_tblheader_Details_Right">Credit</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Balance</para>
<para style="terp_tblheader_Details_Centre">Balance</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="62.0,250.0,57.0,56.0,57.0" style="Table_Grant_Total">
<tr>
<td>
@@ -199,21 +196,18 @@
</para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]] </para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]] </para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<section>
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
<para style="terp_default_2">[[ repeatIn(objects,'o') ]]</para>
<blockTable colWidths="62.0,249.0,57.0,57.0,57.0" style="Table_Account_Detail">
<tr>
<td>
@@ -223,21 +217,18 @@
<para style="terp_default_Bold_9">[[ o.complete_name ]]</para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_debit(o.id,data['form']['date1'],data['form']['date2'])) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_debit(o.id,data['form']['date1'],data['form']['date2'])) ]] </para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_credit(o.id,data['form']['date1'],data['form']['date2'])) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_credit(o.id,data['form']['date1'],data['form']['date2'])) ]] </para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_balance(o.id,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<section>
<para style="Standard">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
<para style="terp_default_2">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
<blockTable colWidths="62.0,249.0,58.0,56.0,57.0" style="Table_Move_Line_Detail">
<tr>
<td>
@@ -247,21 +238,18 @@
<para style="terp_default_Bold_9">[[ move_g['name'] ]]</para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['debit']) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['debit']) ]] </para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['credit']) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['credit']) ]] </para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['balance']) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<section>
<para style="terp_default_9">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para>
<para style="terp_default_2">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para>
<blockTable colWidths="60.0,46.0,204.0,59.0,55.0,58.0" style="Table_Move_Line_Content">
<tr>
<td>
@@ -274,13 +262,13 @@
<para style="terp_default_9_Italic">[[ move_a['name'] ]]</para>
</td>
<td>
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['debit'] )]]</para>
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['debit'] )]] </para>
</td>
<td>
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['credit']) ]]</para>
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['credit']) ]] </para>
</td>
<td>
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['balance']) ]]</para>
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['balance']) ]] [[ company.currency_id.symbol]]</para>
</td>
</tr>
</blockTable>
@@ -288,13 +276,7 @@
<font color="white"> </font>
</para>
</section>
<para style="terp_default_8">
<font color="white"> </font>
</para>
</section>
</section>
<para style="terp_default_8">
<font color="white"> </font>
</para>
</story>
</document>
</document>
addons/account/report/account_aged_partner_balance.py
-2
View File
@@ -62,7 +62,6 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
def _get_lines(self, form):
res = []
account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
self.cr.execute('SELECT DISTINCT res_partner.id AS id,\
res_partner.name AS name \
FROM res_partner,account_move_line AS l, account_account\
@@ -219,7 +218,6 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
def _get_lines_with_out_partner(self, form):
res = []
account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
addons/account/report/account_balance_sheet_horizontal.rml
+1 -1
View File
@@ -233,7 +233,7 @@
<para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font></para>
</td>
<td>
<para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
<para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[(a['code'] and a['name']) and formatLang(abs(a['balance'])) or removeParentNode('font')]] [[ company.currency_id.symbol ]]</font></para>
</td>
</tr>
</blockTable>
addons/account/report/account_central_journal.rml
+10 -12
View File
@@ -283,7 +283,7 @@
<td><para style="terp_tblheader_Details_Right">Balance</para></td>
</tr>
</blockTable>
<blockTable colWidths="50.0,250.0,70.0,70.0,70.0,50.0" style="Table_Account_detail_Title_Currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,220.0,70.0,70.0,70.0,80.0" style="Table_Account_detail_Title_Currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_tblheader_Details">A/C No.</para></td>
<td><para style="terp_tblheader_Details">Account Name</para></td>
@@ -293,18 +293,18 @@
<td><para style="terp_tblheader_Details_Right">Currency</para></td>
</tr>
</blockTable>
<blockTable colWidths="50.0,300.0,70.0,70.0,70.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,270.0,70.0,70.0,70.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_default_Bold_9">Total<font size="8.0">([[ company.currency_id.code]])</font>:</para></td>
<td><para style="terp_default_Bold_9">Total:</para></td>
<td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]] </para></td>
<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]] </para></td>
<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id) ) ]] [[ company.currency_id.symbol ]]</para></td>
</tr>
</blockTable>
<blockTable colWidths="50.0,250.0,70.0,70.0,70.0,50.0" style="Table_Final_Total_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,220.0,70.0,70.0,70.0,80.0" style="Table_Final_Total_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_default_Bold_9">Total:([[ company.currency_id.code]])</para></td>
<td><para style="terp_default_Bold_9">Total:</para></td>
<td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]]</para></td>
<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]]</para></td>
@@ -314,7 +314,7 @@
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]]</para>
<blockTable colWidths="50.0,300.0,70.0,70.0,70.0" style="Table_Journal_Line_Content">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,270.0,70.0,70.0,70.0" style="Table_Journal_Line_Content">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_default_9">[[ line['code'] ]]</para></td>
<td><para style="terp_default_9">[[ line['name'] ]]</para></td>
@@ -323,19 +323,17 @@
<td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
</tr>
</blockTable>
<blockTable colWidths="50.0,250.0,70.0,70.0,70.0,50.0" style="Table_Journal_Line_Content_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,220.0,70.0,70.0,70.0,80.0" style="Table_Journal_Line_Content_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_default_9">[[ line['code'] ]]</para></td>
<td><para style="terp_default_9">[[ line['name'] ]]</para></td>
<td><para style="terp_default_Right_9">[[ formatLang(line['debit']) ]]</para></td>
<td><para style="terp_default_Right_9">[[ formatLang(line['credit'])]]</para></td>
<td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="terp_default_Right_9">[[ line['currency_id'] and formatLang(line['amount_currency'] or '') ]] [[ line['currency_id'] and line['currency_code'] or '']]</para></td>
<td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="terp_default_Right_9"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font></para></td>
</tr>
</blockTable>
</section>
<para style="P9">
<font color="white"> </font>
</para>
</story>
</document>
addons/account/report/account_entries_report_view.xml
+13
View File
@@ -48,6 +48,19 @@
</graph>
</field>
</record>
<record id="view_company_analysis_tree" model="ir.ui.view">
<field name="name">account.company.analysis.tree</field>
<field name="model">account.entries.report</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Company Analysis" >
<field name="user_type"/>
<field name="debit" />
<field name="credit" />
<field name="balance" />
</tree>
</field>
</record>
<record id="view_account_entries_report_search" model="ir.ui.view">
<field name="name">account.entries.report.search</field>
<field name="model">account.entries.report</field>
addons/account/report/account_general_journal.rml
+2 -2
View File
@@ -270,7 +270,7 @@
<td><para style="terp_tblheader_Details_Right">Balance</para></td>
</tr>
<tr>
<td><para style="terp_default_Bold_9">Total:([[ company.currency_id.code]])</para></td>
<td><para style="terp_default_Bold_9">Total:</para></td>
<td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
<td><para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit()) ]] </para></td>
<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit()) ]]</para></td>
@@ -373,7 +373,7 @@
<td><para style="terp_default_Right_9">[[ formatLang(line['debit'] )]]</para></td>
<td><para style="terp_default_Right_9">[[ formatLang(line['credit']) ]]</para></td>
<td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit'] ) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="terp_default_Right_9">[[ line['currency_id'] and formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</para></td>
<td><para style="terp_default_Right_9"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font></para></td>
</tr>
</blockTable>
</section>
addons/account/report/account_general_ledger.py
+1 -1
View File
@@ -161,7 +161,7 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
else:
sql_sort='l.date'
sql = """
SELECT l.id AS lid, l.date AS ldate, j.code AS lcode, l.amount_currency,l.ref AS lref, l.name AS lname, COALESCE(l.debit,0) AS debit, COALESCE(l.credit,0) AS credit, l.period_id AS lperiod_id, l.partner_id AS lpartner_id,
SELECT l.id AS lid, l.date AS ldate, j.code AS lcode, l.currency_id,l.amount_currency,l.ref AS lref, l.name AS lname, COALESCE(l.debit,0) AS debit, COALESCE(l.credit,0) AS credit, l.period_id AS lperiod_id, l.partner_id AS lpartner_id,
m.name AS move_name, m.id AS mmove_id,
c.symbol AS currency_code,
i.id AS invoice_id, i.type AS invoice_type, i.number AS invoice_number,
addons/account/report/account_general_ledger.rml
+1 -1
View File
@@ -334,7 +334,7 @@
<td><para style="P4">[[ formatLang(line['debit']) ]]</para></td>
<td><para style="P4">[[ formatLang(line['credit']) ]]</para></td>
<td><para style="P4">[[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P4">[[ formatLang(line['amount_currency'] or '') ]] [[ line['currency_code'] or '']]</para></td>
<td><para style="P4"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']]</font></para></td>
</tr>
</blockTable>
</section>
addons/account/report/account_general_ledger_landscape.rml
+9 -9
View File
@@ -263,13 +263,13 @@
<tr>
<td>
<blockTable colWidths="404.0,335.0,79,73.5,72.5,79.00" style="Table5">
<tr>
<tr>
<td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para></td>
<td><para style="Standard"></para></td>
<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</u></para></td>
<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</u></para></td>
<td><para style="P9b"><u>[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</u></para></td>
<td><para style="P9b"><u>[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]]</u></para></td>
<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_debit_account(o), dp='Account') ]]</u></para></td>
<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_credit_account(o), dp='Account') ]]</u></para></td>
<td><para style="P9b"><u>[[ formatLang(sum_balance_account(o), dp='Account') ]] [[ company.currency_id.symbol ]]</u></para></td>
<td><para style="P9b"><u>[[ o.currency_id and formatLang(sum_currency_amount_account(o), dp='Account') + o.currency_id.code or '' ]]</u></para></td>
</tr>
</blockTable>
</td>
@@ -292,10 +292,10 @@
<td><para style="P2_content">[[ line['move'] ]]</para></td>
<td><para style="P3_content">[[ line['lname'] ]]</para></td>
<td><para style="P3_content_center">[[ strip_name(line['line_corresp'].replace(', ',','),40) ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['amount_currency'] or '')]] [[ line['currency_code'] or '' ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['debit'], dp='Account') ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['credit'], dp='Account') ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['progress'], dp='Account') ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P4_content"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']]</font></para></td>
</tr>
</blockTable>
addons/account/report/account_partner_ledger.rml
+4 -4
View File
@@ -289,7 +289,7 @@
<para style="terp_tblheader_Details">Ref.</para>
</td>
<td>
<para style="terp_tblheader_Details">A/c No.- Name</para>
<para style="terp_tblheader_Details">Account</para>
</td>
<td>
<para style="terp_tblheader_Details">Entry Label</para>
@@ -359,7 +359,7 @@
<para style="P3">[[ line['move_name'] ]]</para>
</td>
<td>
<para style="P3">[[ line['a_code'] ]] - [[ line['a_name'] ]]</para>
<para style="P3">[[ line['a_code'] ]]</para>
</td>
<td>
<para style="P3">[[ line['ref'] ]] - [[ line['name'] ]]</para>
@@ -391,7 +391,7 @@
<para style="terp_tblheader_Details">Ref.</para>
</td>
<td>
<para style="terp_tblheader_Details">A/c No.- Name</para>
<para style="terp_tblheader_Details">Account</para>
</td>
<td>
<para style="terp_tblheader_Details">Entry Label</para>
@@ -472,7 +472,7 @@
<para style="P3">[[ line['move_name'] ]]</para>
</td>
<td>
<para style="P3">[[ line['a_code'] ]] - [[ line['a_name'] ]]</para>
<para style="P3">[[ line['a_code'] ]]</para>
</td>
<td>
<para style="P3">[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
addons/account/report/account_partner_ledger_other.rml
+4 -4
View File
@@ -444,7 +444,7 @@
<para style="terp_tblheader_Details">Ref.</para>
</td>
<td>
<para style="terp_tblheader_Details">A/c No.- Name</para>
<para style="terp_tblheader_Details">Account</para>
</td>
<td>
<para style="terp_tblheader_Details">Entry Label</para>
@@ -507,7 +507,7 @@
<para style="P3">[[ line['move_name'] ]]</para>
</td>
<td>
<para style="P3">[[ line['a_code'] ]] - [[ line['a_name'] ]]</para>
<para style="P3">[[ line['a_code'] ]]</para>
</td>
<td>
<para style="P3">[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
@@ -537,7 +537,7 @@
<para style="terp_tblheader_Details">Ref.</para>
</td>
<td>
<para style="terp_tblheader_Details">A/c No.- Name</para>
<para style="terp_tblheader_Details">Account</para>
</td>
<td>
<para style="terp_tblheader_Details">Entry Label</para>
@@ -612,7 +612,7 @@
<para style="P3">[[ line['move_name'] ]]</para>
</td>
<td>
<para style="P3">[[ line['a_code'] ]] - [[ line['a_name'] ]]</para>
<para style="P3">[[ line['a_code'] ]]</para>
</td>
<td>
<para style="P3">[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
addons/account/report/account_print_overdue.rml
+22 -22
View File
@@ -46,11 +46,13 @@
<lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,1" stop="1,1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="2,1" stop="2,1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="3,1" stop="3,1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="4,1" stop="4,1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="5,1" stop="5,1"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
@@ -116,7 +118,7 @@
</para>
<para style="terp_default_9">Document: Customer account statement</para>
<para style="terp_default_9">Date: [[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
<para style="terp_default_9">Customer Ref: [[ o.ref or '' ]]</para>
<para style="terp_default_9">Customer Ref: [[ o.ref or ' ']]</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
@@ -181,10 +183,10 @@
<para style="terp_default_Centre_9">[[ line['date_maturity'] and formatLang(line['date_maturity'],date=True) or '' ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['debit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['credit'] * -1) or ' ') ]]</para>
<para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['debit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['credit'] * -1) or ' ') ]] </para>
</td>
<td>
<para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]] </para>
<para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang((line['date_maturity'] &lt; time.strftime('%Y-%m-%d'))) and formatLang(line['debit'] - line['credit']) ]] [[ company.currency_id.symbol ]]</para>
@@ -195,7 +197,7 @@
</tr>
</blockTable>
</section>
<blockTable colWidths="247.0,65.0,59.0,56.0,66.0,17.0" style="Table2">
<blockTable colWidths="244.0,71.0,56.0,56.0,66.0,17.0" style="Table2">
<tr>
<td>
<para style="terp_default_8">
@@ -206,7 +208,7 @@
<para style="terp_default_Bold_9">Sub-Total : </para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['debit'] or 0) or (y['account_id']['type'] == 'payable' and y['credit'] * -1 or 0)), getLines(o), 0))) ]]</para>
<para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['debit'] or 0) or (y['account_id']['type'] == 'payable' and y['credit'] * -1 or 0)), getLines(o), 0))) ]] </para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['credit'] or 0) or (y['account_id']['type'] == 'payable' and y['debit'] * -1 or 0)), getLines(o), 0))) ]] </para>
@@ -220,6 +222,8 @@
</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="250.0,66.0,62.0,131.0" style="Table4">
<tr>
<td>
<para style="terp_default_8">
@@ -230,25 +234,21 @@
<para style="terp_default_Bold_9">Balance : </para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.symbol ]]</para>
<para style="terp_tblheader_Details_Right">[[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_9">
<para style="terp_default_8">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="terp_default_9">Total amount due: [[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.symbol ]].</para>
<para style="terp_default_8">
<font color="white"> </font>
addons/account/report/account_profit_horizontal.rml
+1 -1
View File
@@ -240,7 +240,7 @@
</para>
</td>
<td>
<para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance1'])) ]] [[ company.currency_id.symbol ]]</font></para>
<para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[(a['code1'] and a['name1']) and formatLang(abs(a['balance1'])) or removeParentNode('font') ]] [[ company.currency_id.symbol ]]</font></para>
</td>
</tr>
</blockTable>
addons/account/report/account_tax_report.py
-1
View File
@@ -190,7 +190,6 @@ class tax_report(rml_parse.rml_parse):
bcl_rup_ind = ind - 1
while (bcl_current_level >= int(accounts[bcl_rup_ind]['level']) and bcl_rup_ind >= 0 ):
tot_elem = copy.copy(accounts[bcl_rup_ind], context=context)
res_tot = { 'code': accounts[bcl_rup_ind]['code'],
'name': '',
'debit': 0,
addons/account/report/account_tax_report.rml
+1 -1
View File
@@ -104,7 +104,7 @@
</stylesheet>
<story>
<para style="P2">Taxes</para>
<para style="P2">Tax Statement</para>
<blockTable colWidths="340.0,55.0,55.0,90.0" style="Table2" repeatRows="1">
<tr>
<td><para style="P12">Tax Name</para></td>
addons/account/test/account_report.yml
+7 -4
View File
@@ -30,6 +30,7 @@
-
!record {model: account.tax.code, id: account_tax_code_0}:
name : Tax Code Test
sign : 10.00
-
Print Tax Code entries report
-
@@ -39,13 +40,14 @@
if tools.config['test_report_directory']:
file(os.path.join(tools.config['test_report_directory'], 'account-tax-code-entries.'+format), 'wb+').write(data)
-
Print Vat Declaration Report
-
!python {model: account.tax.code}: |
import netsvc, tools, os
data_dict = {'model': 'ir.ui.menu', 'form': {'based_on': 'invoices','company_id':ref('base.main_company'),'periods':[]}}
(data, format) = netsvc.LocalService('report.account.vat.declaration').create(cr, uid, [ref("account_tax_code_0")], data_dict, {})
(data, format) = netsvc.LocalService('report.account.vat.declaration').create(cr, uid, [ref("account_move_0")], data_dict, {})
if tools.config['test_report_directory']:
file(os.path.join(tools.config['test_report_directory'], 'account-vat-declaration.'+format), 'wb+').write(data)
@@ -277,7 +279,7 @@
fy_id = ref('account.data_fiscalyear')
period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
journal_period_ids = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', journal_ids), ('period_id', 'in', period_list)], context=context)
obj_move = self.pool.get('account.move.line')
ctx = {}
ctx['fiscalyear'] = fy_id
@@ -285,8 +287,9 @@
ctx['chart_account_id'] = ref('account.chart0')
query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
data_dict = {'model': 'ir.ui.menu', 'form': {'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'display_partner': 'non-zero_balance','fiscalyear': fy_id ,'target_move': 'all','query_line':query_line}}
(data, format) = netsvc.LocalService('report.account.partner.balance').create(cr, uid, [], data_dict, {})
data_dict = {'model': 'ir.ui.menu', 'form': {'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'active_ids':journal_period_ids,'display_partner': 'all','fiscalyear': fy_id ,'target_move': 'all','query_line':query_line}}
(data, format) = netsvc.LocalService('report.account.partner.balance').create(cr, uid, journal_period_ids, data_dict, {})
if tools.config['test_report_directory']:
file(os.path.join(tools.config['test_report_directory'], 'account-partner_balance.'+format), 'wb+').write(data)
addons/account/test/account_validate_account_move.yml
+10
View File
@@ -1,3 +1,12 @@
-
Demo data for Account tax code
-
!record {model: account.tax.code, id: account_tax_code_0}:
name : Tax Code Test
sign : 1.00
-
-
In order to test the 'Validate Journal Entries' wizard in OpenERP, I created an account move
@@ -20,6 +29,7 @@
- journal_id: account.bank_journal
period_id: account.period_6
ref: '2010010'
tax_code_id: account_tax_code_0
tax_amount: 0.0
account_id: account.a_recv
amount_currency: 0.0
addons/account/wizard/account_vat_view.xml
+1 -1
View File
@@ -16,7 +16,7 @@
<field name="periods" nolabel="1" colspan="2"/>
<group col="2" colspan="4">
<button icon='gtk-cancel' special="cancel" string="Cancel" />
<button name="create_vat" string="Print VAT Decl." colspan="1" type="object" icon="gtk-ok"/>
<button name="create_vat" string="Print Tax Statement" colspan="1" type="object" icon="gtk-ok"/>
</group>
</form>
</field>
addons/account_budget/test/account_budget_report.yml
+3 -3
View File
@@ -3,7 +3,7 @@
-
!python {model: account.analytic.account}: |
import netsvc, tools, os, time
data_dict = {'model': 'account.analytic.account', 'form': {'date1':time.strftime("%Y-01-01"),'date2':time.strftime('%Y-%m-%d'),'id':ref('account.analytic_root'),'context':{}}}
data_dict = {'model': 'account.analytic.account', 'form': {'date_from':time.strftime("%Y-01-01"),'date_to':time.strftime('%Y-%m-%d'),'id':ref('account.analytic_root'),'context':{}}}
(data, format) = netsvc.LocalService('report.account.analytic.account.budget').create(cr, uid, [ref('account.analytic_root')], data_dict, {})
if tools.config['test_report_directory']:
file(os.path.join(tools.config['test_report_directory'], 'account_budget-analytic_budget_report.'+format), 'wb+').write(data)
@@ -12,7 +12,7 @@
-
!python {model: account.budget.post}: |
import netsvc, tools, os, time
data_dict = {'model': 'account.budget.post', 'form': {'date1':time.strftime("%Y-01-01"),'date2':time.strftime('%Y-%m-%d'),'id':ref('account_budget.account_budget_post_sales0'),'context':{}}}
data_dict = {'model': 'account.budget.post', 'form': {'date_from':time.strftime("%Y-01-01"),'date_to':time.strftime('%Y-%m-%d'),'id':ref('account_budget.account_budget_post_sales0'),'context':{}}}
(data, format) = netsvc.LocalService('report.account.analytic.account.budget').create(cr, uid, [ref('account_budget.account_budget_post_sales0')], data_dict, {})
if tools.config['test_report_directory']:
file(os.path.join(tools.config['test_report_directory'], 'account_budget-budget_report.'+format), 'wb+').write(data)
@@ -24,4 +24,4 @@
data_dict = {'model': 'account.budget.post', 'form': {'date_from':time.strftime("%Y-01-01"),'date_to':time.strftime('%Y-%m-%d'),'report':'analytic-full','id':ref('account_budget.crossovered_budget_budgetoptimistic0'),'context':{}}}
(data, format) = netsvc.LocalService('report.crossovered.budget.report').create(cr, uid, [ref('account_budget.crossovered_budget_budgetoptimistic0')], data_dict, {})
if tools.config['test_report_directory']:
file(os.path.join(tools.config['test_report_directory'], 'account_budget-crossovered_budget_report.'+format), 'wb+').write(data)
file(os.path.join(tools.config['test_report_directory'], 'account_budget-crossovered_budget_report.'+format), 'wb+').write(data)
addons/account_report/board_account_report_view.xml
+4 -4
View File
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="board_account_report_form" model="ir.ui.view">
<!-- <record id="board_account_report_form" model="ir.ui.view">
<field name="name">board.account.report.form</field>
<field name="model">board.board</field>
<field name="inherit_id" ref="account.board_account_form"/>
<field name="inherit_id" ref="account.board_account_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<xpath expr="/form/hpaned/child2/action[@string='Aged receivables']" position="before">
<xpath expr="/form/hpaned/child2/action[@string='Aged receivables']" position="before">
<button colspan="4" icon="terp-purchase" name="%(account_report.action_account_report_tree_view_indicator)d" string="My indicators" type="action"/>
</xpath>
</field>
</record>
</record>-->
</data>
</openerp>
addons/auction/__openerp__.py
+1
View File
@@ -42,6 +42,7 @@
'depends': ['base', 'account', 'hr_attendance'],
'init_xml': ['auction_sequence.xml', 'auction_data.xml'],
'update_xml': [
'security/auction_security.xml',
'security/ir.model.access.csv',
'wizard/auction_lots_make_invoice_buyer_view.xml',
'wizard/auction_lots_make_invoice_view.xml',
addons/auction/auction_view.xml
+7 -4
View File
@@ -1,8 +1,9 @@
<?xml version="1.0"?>
<openerp>
<data>
<menuitem name="Auction" id="auction_menu_root" icon="terp-purchase" sequence="26" groups="base.group_system"/>
<menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="7"/>
<menuitem name="Auction" id="auction_menu_root" icon="terp-purchase" sequence="26"
groups="base.group_system,group_auction_manager,group_auction_user"/>
<menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="7" groups="base.group_system,group_auction_manager"/>
<menuitem name="Tools Bar Codes" id="auction_outils_menu" parent="auction_menu_root" sequence="5" />
<menuitem name="Deliveries Management" action="action_auction_taken" id="menu_wizard_emporte" parent="auction_outils_menu"/>
@@ -80,7 +81,8 @@
<field name="view_id" ref="view_auction_object_categories_tree"/>
</record>
<menuitem name="Object Categories" parent="auction_config_menu" action="action_auction_object_categories" id="menu_auction_object_cat"/>
<menuitem name="Object Categories" parent="auction_config_menu" action="action_auction_object_categories"
id="menu_auction_object_cat" groups="base.group_system,group_auction_manager"/>
<!-- Auction Management/Auction Dates/New Auction Dates -->
@@ -485,6 +487,7 @@
</record>
<record model="ir.actions.act_window" id="action_all_objects">
<field name="name">Objects</field>
<field name="res_model">auction.lots</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
@@ -762,7 +765,7 @@
<menuitem name="Buyers" id="auction_buyers_menu" parent="auction_menu_root" sequence="4"/>
<menuitem name="Bids" parent="auction_buyers_menu" action="action_bid_open" id="menu_action_bid_open"/>
<menuitem name="Reporting" id="auction_report_menu" parent="auction_menu_root" sequence="6"/>
<menuitem name="Reporting" id="auction_report_menu" parent="auction_menu_root" sequence="6" groups="base.group_system,group_auction_manager"/>
<act_window name="Deposit slip"
context="{'search_default_partner_id': [active_id]}"
addons/auction/report/report_auction_view.xml
+12 -11
View File
@@ -37,23 +37,24 @@
<field name="arch" type="xml">
<search string="Auction Summary">
<group>
<filter icon="terp-go-year" string=" 365 Days "
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Auction in last 365 days"/>
<filter icon="terp-go-month" string=" 30 Days "
<filter icon="terp-go-year" string="Year"
domain="[('year','=',time.strftime('%%Y'))]"
help="Auction during current year."/>
<filter icon="terp-go-month" string="Month"
name="month"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
help="Auction in last 30 days"/>
domain="[('month','=',time.strftime('%%m'))]"
help="Auction during current month."/>
<filter icon="terp-go-week"
string=" 7 Days "
string="Month -1"
separator="1"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
help="Auction during last 7 days"/>
domain="[('month','=',(datetime.date.today() - datetime.timedelta(365/12)).strftime('%%m'))]"
help="Auction during last month."/>
<separator orientation="vertical"/>
<filter icon="terp-document-new"
string="Draft"
domain="[('state','=','draft')]"/>
<filter icon="terp-dolar"
name="sold"
string="Sold"
domain="[('state','=', 'sold')]"/>
<separator orientation="vertical"/>
@@ -74,7 +75,7 @@
<filter string="Buyer" icon="terp-personal" name="buyer" context="{'group_by':'buyer'}"/>
<filter string="Seller" icon="terp-personal" name="seller" context="{'group_by':'seller'}"/>
<separator orientation="vertical"/>
<filter string="Auction" icon="terp-project" name="auction" context="{'group_by':'auction'}"/>
<filter string="Auction" icon="terp-project" name="auction_date" context="{'group_by':'auction'}"/>
<separator orientation="vertical" />
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<filter string="Type"
@@ -113,7 +114,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="view_report_auction_search"/>
<field name="context">{'search_default_month':1}</field>
<field name="context">{'search_default_month':1,'search_default_sold':1,'search_default_auction_date':1, 'group_by':[], 'group_by_no_leaf':1}</field>
</record>
<menuitem name="Auction Analysis" action="action_report_auction" id="menu_report_auction" parent="auction.auction_report_menu"/>
addons/auction/security/auction_security.xml
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="0">
<record id="group_auction_manager" model="res.groups">
<field name="name">Auction / Manager</field>
</record>
<record id="group_auction_user" model="res.groups">
<field name="name">Auction / User</field>
</record>
</data>
</openerp>
addons/auction/security/ir.model.access.csv
+31 -14
View File
@@ -1,18 +1,23 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_auction_artists","auction.artists","model_auction_artists","base.group_user",1,1,1,1
"access_auction_dates","auction.dates","model_auction_dates","base.group_user",1,1,1,1
"access_auction_deposit","auction.deposit","model_auction_deposit","base.group_user",1,1,1,1
"access_auction_deposit_cost","auction.deposit.cost","model_auction_deposit_cost","base.group_user",1,1,1,1
"access_auction_lot_category","auction.lot.category","model_auction_lot_category","base.group_user",1,1,1,1
"access_auction_lots","auction.lots","model_auction_lots","base.group_user",1,1,1,1
"access_auction_bid","auction.bid","model_auction_bid","base.group_user",1,1,1,1
"access_auction_bid_line","auction.bid.line","model_auction_bid_line","base.group_user",1,1,1,1
"access_auction_lot_history","auction.lot.history","model_auction_lot_history","base.group_user",1,1,1,1
"access_report_auction","report.auction","model_report_auction","base.group_user",1,0,0,0
"access_report_auction_object_date","report.auction.object.date","model_report_auction_object_date","base.group_user",1,0,0,0
"access_report_auction_adjudication","report.auction.adjudication","model_report_auction_adjudication","base.group_user",1,0,0,0
"access_report_object_encoded","report.object.encoded","model_report_object_encoded","base.group_user",1,0,0,0
"access_aie_category","aie.category","model_aie_category","base.group_user",1,0,0,0
"access_auction_artists","auction.artists","model_auction_artists","group_auction_manager",1,1,1,1
"access_auction_dates_manager","auction.dates manager","model_auction_dates","group_auction_manager",1,1,1,1
"access_auction_deposit_manager","auction.deposit manager","model_auction_deposit","group_auction_manager",1,1,1,1
"access_auction_deposit_cost","auction.deposit.cost","model_auction_deposit_cost","group_auction_manager",1,1,1,1
"access_auction_lot_category","auction.lot.category","model_auction_lot_category","group_auction_user",1,0,0,0
"access_auction_lot_category_manager","auction.lot.category manager","model_auction_lot_category","group_auction_manager",1,1,1,1
"access_auction_lots","auction.lots","model_auction_lots","group_auction_user",1,1,1,1
"access_auction_lots_manager","auction.lots manager","model_auction_lots","group_auction_manager",1,0,0,0
"access_auction_bid","auction.bid","model_auction_bid","group_auction_user",1,1,1,1
"access_auction_bid_manager","auction.bid manager","model_auction_bid","group_auction_manager",1,0,0,0
"access_auction_bid_line","auction.bid.line","model_auction_bid_line","group_auction_user",1,1,1,1
"access_auction_bid_line_manager","auction.bid.line manager","model_auction_bid_line","group_auction_manager",1,0,0,0
"access_auction_lot_history","auction.lot.history","model_auction_lot_history","group_auction_user",1,1,1,1
"access_auction_lot_history_manager","auction.lot.history manager","model_auction_lot_history","group_auction_manager",1,0,0,0
"access_report_auction","report.auction","model_report_auction","group_auction_manager",1,1,1,1
"access_report_auction_object_date","report.auction.object.date","model_report_auction_object_date","group_auction_manager",1,1,1,1
"access_report_auction_adjudication","report.auction.adjudication","model_report_auction_adjudication","group_auction_manager",1,1,1,1
"access_report_object_encoded","report.object.encoded","model_report_object_encoded","group_auction_manager",1,1,1,1
"access_aie_category","aie.category","model_aie_category","group_auction_manager",1,1,1,1
"access_auction_dates_system","auction.dates system","model_auction_dates","base.group_system",1,0,0,0
"access_auction_lots_system","auction.lots system","model_auction_lots","base.group_system",1,0,0,0
"access_auction_deposit_system","auction.deposit system","model_auction_deposit","base.group_system",1,0,0,0
@@ -22,3 +27,15 @@
"access_auction_lot_history_system","auction.lot.history system","model_auction_lot_history","base.group_system",1,0,0,0
"access_auction_deposit_cost_system","auction.deposit.cost system","model_auction_deposit_cost","base.group_system",1,0,0,0
"access_auction_bid_line_system","auction.bid.line system","model_auction_bid_line","base.group_system",1,0,0,0
"access_auction_account_tax","account.tax manager","account.model_account_tax","group_auction_manager",1,1,1,0
"access_auction_account_fiscalyear","account.fiscalyear manager","account.model_account_fiscalyear","group_auction_manager",1,1,1,0
"access_auction_account_journal","account.journal manager","account.model_account_journal","group_auction_manager",1,1,1,0
"access_auction_account_invoice","account.invoice manager","account.model_account_invoice","group_auction_manager",1,1,1,0
"access_auction_account_invoice_line","account.invoice.line manager","account.model_account_invoice_line","group_auction_manager",1,1,1,0
"access_auction_account_invoice_tax","account.invoice.tax manager","account.model_account_invoice_tax","group_auction_manager",1,1,1,0
"access_auction_account_analytic_journal","account.analytic.journal manager","account.model_account_analytic_journal","group_auction_manager",1,1,1,0
"access_auction_account_period","account.period manager","account.model_account_period","group_auction_manager",1,1,1,0
"access_auction_account_move","account.move manager","account.model_account_move","group_auction_manager",1,1,1,0
"access_auction_account_move_line","account.move.line manager","account.model_account_move_line","group_auction_manager",1,1,1,0
"access_auction_account_journal_period","account.journal.period manager","account.model_account_journal_period","group_auction_manager",1,1,1,0
"access_auction_account_analytic_line","account.analytic.line manager","account.model_account_analytic_line","group_auction_manager",1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_auction_artists auction.artists model_auction_artists base.group_user group_auction_manager 1 1 1 1
3 access_auction_dates access_auction_dates_manager auction.dates auction.dates manager model_auction_dates base.group_user group_auction_manager 1 1 1 1
4 access_auction_deposit access_auction_deposit_manager auction.deposit auction.deposit manager model_auction_deposit base.group_user group_auction_manager 1 1 1 1
5 access_auction_deposit_cost auction.deposit.cost model_auction_deposit_cost base.group_user group_auction_manager 1 1 1 1
6 access_auction_lot_category auction.lot.category model_auction_lot_category base.group_user group_auction_user 1 1 0 1 0 1 0
7 access_auction_lots access_auction_lot_category_manager auction.lots auction.lot.category manager model_auction_lots model_auction_lot_category base.group_user group_auction_manager 1 1 1 1
8 access_auction_bid access_auction_lots auction.bid auction.lots model_auction_bid model_auction_lots base.group_user group_auction_user 1 1 1 1
9 access_auction_bid_line access_auction_lots_manager auction.bid.line auction.lots manager model_auction_bid_line model_auction_lots base.group_user group_auction_manager 1 1 0 1 0 1 0
10 access_auction_lot_history access_auction_bid auction.lot.history auction.bid model_auction_lot_history model_auction_bid base.group_user group_auction_user 1 1 1 1
11 access_report_auction access_auction_bid_manager report.auction auction.bid manager model_report_auction model_auction_bid base.group_user group_auction_manager 1 0 0 0
12 access_report_auction_object_date access_auction_bid_line report.auction.object.date auction.bid.line model_report_auction_object_date model_auction_bid_line base.group_user group_auction_user 1 0 1 0 1 0 1
13 access_report_auction_adjudication access_auction_bid_line_manager report.auction.adjudication auction.bid.line manager model_report_auction_adjudication model_auction_bid_line base.group_user group_auction_manager 1 0 0 0
14 access_report_object_encoded access_auction_lot_history report.object.encoded auction.lot.history model_report_object_encoded model_auction_lot_history base.group_user group_auction_user 1 0 1 0 1 0 1
15 access_aie_category access_auction_lot_history_manager aie.category auction.lot.history manager model_aie_category model_auction_lot_history base.group_user group_auction_manager 1 0 0 0
16 access_report_auction report.auction model_report_auction group_auction_manager 1 1 1 1
17 access_report_auction_object_date report.auction.object.date model_report_auction_object_date group_auction_manager 1 1 1 1
18 access_report_auction_adjudication report.auction.adjudication model_report_auction_adjudication group_auction_manager 1 1 1 1
19 access_report_object_encoded report.object.encoded model_report_object_encoded group_auction_manager 1 1 1 1
20 access_aie_category aie.category model_aie_category group_auction_manager 1 1 1 1
21 access_auction_dates_system auction.dates system model_auction_dates base.group_system 1 0 0 0
22 access_auction_lots_system auction.lots system model_auction_lots base.group_system 1 0 0 0
23 access_auction_deposit_system auction.deposit system model_auction_deposit base.group_system 1 0 0 0
27 access_auction_lot_history_system auction.lot.history system model_auction_lot_history base.group_system 1 0 0 0
28 access_auction_deposit_cost_system auction.deposit.cost system model_auction_deposit_cost base.group_system 1 0 0 0
29 access_auction_bid_line_system auction.bid.line system model_auction_bid_line base.group_system 1 0 0 0
30 access_auction_account_tax account.tax manager account.model_account_tax group_auction_manager 1 1 1 0
31 access_auction_account_fiscalyear account.fiscalyear manager account.model_account_fiscalyear group_auction_manager 1 1 1 0
32 access_auction_account_journal account.journal manager account.model_account_journal group_auction_manager 1 1 1 0
33 access_auction_account_invoice account.invoice manager account.model_account_invoice group_auction_manager 1 1 1 0
34 access_auction_account_invoice_line account.invoice.line manager account.model_account_invoice_line group_auction_manager 1 1 1 0
35 access_auction_account_invoice_tax account.invoice.tax manager account.model_account_invoice_tax group_auction_manager 1 1 1 0
36 access_auction_account_analytic_journal account.analytic.journal manager account.model_account_analytic_journal group_auction_manager 1 1 1 0
37 access_auction_account_period account.period manager account.model_account_period group_auction_manager 1 1 1 0
38 access_auction_account_move account.move manager account.model_account_move group_auction_manager 1 1 1 0
39 access_auction_account_move_line account.move.line manager account.model_account_move_line group_auction_manager 1 1 1 0
40 access_auction_account_journal_period account.journal.period manager account.model_account_journal_period group_auction_manager 1 1 1 0
41 access_auction_account_analytic_line account.analytic.line manager account.model_account_analytic_line group_auction_manager 1 1 1 1
addons/crm/board_crm_view.xml
+8 -8
View File
@@ -17,7 +17,7 @@
</graph>
</field>
</record>
<record id="view_report_crm_oppor_graph" model="ir.ui.view">
<field name="name">crm.lead.report.graph</field>
<field name="model">crm.lead.report</field>
@@ -29,7 +29,7 @@
</graph>
</field>
</record>
<record model="ir.ui.view" id="crm_case_my_open_oppor">
<field name="name">Opportunities</field>
<field name="model">crm.lead</field>
@@ -71,7 +71,7 @@
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid),('state','=','open'), ('type', '=', 'opportunity')]</field>
</record>
<record model="ir.actions.act_window.view" id="act_my_oppor_tree_view">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
@@ -111,11 +111,11 @@
</record>
<record model="ir.ui.view" id="board_crm_form">
<field name="name">CRM - Dashboard Form</field>
<field name="name">Sales Dashboard Form</field>
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Connecting Dashboard">
<form string="Sales Dashboard">
<hpaned>
<child1>
<action
@@ -145,7 +145,7 @@
</field>
</record>
<record model="ir.actions.act_window" id="open_board_crm">
<field name="name">CRM Dashboard</field>
<field name="name">Sales Dashboard</field>
<field name="res_model">board.board</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
@@ -154,10 +154,10 @@
</record>
<menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
<menuitem
name="Connecting Dashboard" parent="board.menu_dasboard"
name="Sales Dashboard" parent="board.menu_dasboard"
action="open_board_crm"
sequence="1"
id="menu_board_crm" icon="terp-graph"/>
<menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system,base.group_partner_manager" action="open_board_crm"/>
</data>
</openerp>
</openerp>
addons/crm/report/crm_phonecall_report.py
-1
View File
@@ -47,7 +47,6 @@ class crm_phonecall_report(osv.osv):
@param context: A standard dictionary for contextual values """
res = {}
state_perc = 0.0
avg_ans = 0.0
for case in self.browse(cr, uid, ids, context):
addons/crm/wizard/crm_lead_to_opportunity.py
-1
View File
@@ -207,7 +207,6 @@ class crm_lead2opportunity_partner(osv.osv_memory):
context = {}
partner_ids = self._create_partner(cr, uid, ids, context)
mod_obj = self.pool.get('ir.model.data')
value = {}
data_obj = self.pool.get('ir.model.data')
data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_action')
addons/delivery/report/shipping.rml
+2 -2
View File
@@ -179,7 +179,7 @@
<blockTable colWidths="370.0,85.0,82.0" repeatRows="1" style="Table3">
<tr>
<td>
<para style="terp_tblheader_Details">Designation</para>
<para style="terp_tblheader_Details">Description</para>
</td>
<td>
<para style="terp_tblheader_Details_Centre">Lot</para>
@@ -215,4 +215,4 @@
<font color="white"> </font>
</para>
</story>
</document>
</document>
addons/delivery/test/delivery_report.yml
+29 -1
View File
@@ -1,8 +1,36 @@
-
In Order to test the delivery report I create picking with move lines.
-
!record {model: stock.picking, id: stock_picking_delivery}:
name: test_picking
origin: SO001
address_id: base.res_partner_address_4
company_id: base.main_company
date: '2010-05-11 15:18:52'
invoice_state: none
move_lines:
- company_id: base.main_company
date_planned: '2010-05-11 15:18:57'
location_dest_id: stock.stock_location_customers
location_id: stock.stock_location_stock
name: HP CD writers
product_id: product.product_product_pc1
product_qty: 3.0
product_uom: product.product_uom_unit
date: '2010-05-11 15:18:57'
product_uos_qty: 3.0
move_type: direct
type: out
-
In order to test the PDF reports defined on a Delievry, we will print a Delivery Order report
-
!python {model: stock.picking}: |
import netsvc, tools, os
(data, format) = netsvc.LocalService('report.sale.shipping').create(cr, uid, [ref('stock.stock_picking_1')], {}, {})
(data, format) = netsvc.LocalService('report.sale.shipping').create(cr, uid, [ref('stock_picking_delivery')], {}, {})
if tools.config['test_report_directory']:
file(os.path.join(tools.config['test_report_directory'], 'delievry-shipping'+format), 'wb+').write(data)
addons/hr_attendance/report/hr_custom_default.xsl
-4
View File
@@ -9,8 +9,6 @@
<drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
<setFont name="DejaVu Sans Bold" size="10"/>
<drawString x="13.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
<setFont name="DejaVu Sans" size="8"/>
<drawRightString x="28.4cm" y="19.5cm"><pageNumber/> / </drawRightString>
<stroke color="#000000"/>
<lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
</xsl:template>
@@ -23,8 +21,6 @@
<drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
<setFont name="DejaVu Sans Bold" size="10"/>
<drawString x="27.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
<setFont name="DejaVu Sans" size="8"/>
<drawRightString x="28.4cm" y="19.5cm"><pageNumber/> / </drawRightString>
<stroke color="#000000"/>
<lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
</xsl:template>
addons/hr_expense/report/expense.rml
+7 -7
View File
@@ -115,9 +115,9 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
<para style="terp_header_Centre">HR Expenses [[ o.name or '' ]]</para>
<para style="terp_default_8">
<font color="white"> </font>
<para style="terp_header_Centre">HR Expenses</para>
<para style="terp_tblheader_General_Centre">
<font face="Helvetica" size="9.0">[[ o.name or '' ]]</font>
</para>
<para style="terp_default_8">
<font color="white"> </font>
@@ -166,10 +166,10 @@
<para style="terp_tblheader_Details_Right">Unit Price</para>
</td>
<td>
<para style="terp_tblheader_Details_Centre">Qty</para>
<para style="terp_tblheader_Details_Right">Qty</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Total Price([[ o.currency_id.code ]])</para>
<para style="terp_tblheader_Details_Right">Total Price</para>
</td>
</tr>
</blockTable>
@@ -181,7 +181,7 @@
<blockTable colWidths="49.0,204.0,46.0,79.0,53.0,92.0" style="Table_expense_line">
<tr>
<td>
<para style="terp_default_9">[[ formatLang(line.date_value,date = True) ]]</para>
<para style="terp_default_9">[[ formatLang(line.date_value,date=True) ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line.name or '' ]] [[ line.description or '' ]]</para>
@@ -259,7 +259,7 @@
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="terp_default_9">[[ setTag('para','xpre') ]] [[ o.note or '' ]] </para>
<para style="terp_default_9">[[ o.note or '' ]] [[ setTag('para','xpre') ]]</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
addons/hr_holidays/migrations/1.5/post-01-convert-limits-into-requests.py
+9 -8
View File
@@ -21,14 +21,15 @@
__name__ = "Convert the Holidays Per User limits into positive leave request"
def migrate(cr, version):
cr.execute("""SELECT id, employee_id, holiday_status, max_leaves, notes, create_uid
FROM hr_holidays_per_user;""")
for record in cr.fetchall():
cr.execute("""INSERT INTO hr_holidays
(employee_id, type, allocation_type, name, holiday_status_id,
state, number_of_days, notes, manager_id) VALUES
(%s, 'add', 'company', 'imported holiday_per_user', %s,
'validated', %s, %s, %s) """, (record[1],record[2],record[3],record[4],record[5]))
# cr.execute("""SELECT id, employee_id, holiday_status, max_leaves, notes, create_uid
# FROM hr_holidays_per_user;""")
# for record in cr.fetchall():
# cr.execute("""INSERT INTO hr_holidays
# (employee_id, type, allocation_type, name, holiday_status_id,
# state, number_of_days, notes, manager_id) VALUES
# (%s, 'add', 'company', 'imported holiday_per_user', %s,
# 'validated', %s, %s, %s) """, (record[1],record[2],record[3],record[4],record[5]))
return {}
addons/hr_holidays/report/hr_custom_default.xsl
-4
View File
@@ -9,8 +9,6 @@
<drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
<setFont name="DejaVu Sans Bold" size="10"/>
<drawString x="13.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
<setFont name="DejaVu Sans" size="8"/>
<drawRightString x="28.4cm" y="19.5cm"><pageNumber/> / </drawRightString>
<stroke color="#000000"/>
<lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
</xsl:template>
@@ -23,8 +21,6 @@
<drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
<setFont name="DejaVu Sans Bold" size="10"/>
<drawString x="27.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
<setFont name="DejaVu Sans" size="8"/>
<drawRightString x="28.4cm" y="19.5cm"><pageNumber/> / </drawRightString>
<stroke color="#000000"/>
<lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
</xsl:template>
addons/hr_payroll/report/report_employees_detail.py
+1 -1
View File
@@ -218,7 +218,7 @@ class employees_salary_report(rml_parse.rml_parse):
def get_monthly_total(self):
return self.month_total_list
report_sxw.report_sxw('report.employees.salary', 'hr.payslip', 'hr_payroll/report/report_employees_detail.rml', parser=employees_salary_report,header=3)
report_sxw.report_sxw('report.employees.salary', 'hr.payslip', 'hr_payroll/report/report_employees_detail.rml', parser=employees_salary_report,header='internal landscape')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/hr_payroll/report/report_employees_detail.rml
+1 -1
View File
@@ -616,4 +616,4 @@
<font color="white"> </font>
</para>
</story>
</document>
</document>
addons/hr_payroll/report/report_year_report.rml
+1 -1
View File
@@ -296,4 +296,4 @@
</para>
</section>
</story>
</document>
</document>
addons/hr_payroll/report/report_year_salary.py
+1 -1
View File
@@ -95,7 +95,7 @@ class year_salary_report(rml_parse.rml_parse):
self.total += item[count]
return self.total
report_sxw.report_sxw('report.year.salary', 'hr.payslip', 'hr_payroll/report/report_year_report.rml', parser=year_salary_report,header=3)
report_sxw.report_sxw('report.year.salary', 'hr.payslip', 'hr_payroll/report/report_year_report.rml', parser=year_salary_report,header='internal landscape')
addons/hr_payroll/report/rml_parse.py
+3 -3
View File
@@ -151,10 +151,10 @@ class rml_parse(report_sxw.rml_parse):
print Stringer
return Stringer
def _add_header(self, node, header=1):
if header==2:
def _add_header(self, node, header='external'):
if header=='internal':
rml_head = self.rml_header2
elif header==3:
elif header=='internal landscape':
rml_head = self.rml_header3
else:
rml_head = self.rml_header
addons/hr_timesheet/report/custom_default.xsl
-4
View File
@@ -9,8 +9,6 @@
<drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
<setFont name="DejaVu Sans Bold" size="10"/>
<drawString x="13.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
<setFont name="DejaVu Sans" size="8"/>
<drawRightString x="28.4cm" y="19.5cm"><pageNumber/> / </drawRightString>
<stroke color="#000000"/>
<lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
</xsl:template>
@@ -23,8 +21,6 @@
<drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
<setFont name="DejaVu Sans Bold" size="10"/>
<drawString x="27.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
<setFont name="DejaVu Sans" size="8"/>
<drawRightString x="28.4cm" y="19.5cm"><pageNumber/> / </drawRightString>
<stroke color="#000000"/>
<lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
</xsl:template>
addons/hr_timesheet_invoice/__openerp__.py
+6 -5
View File
@@ -31,9 +31,9 @@ reports, eso.""",
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'depends': ['account', 'hr_timesheet'],
'init_xml': [],
'update_xml': [
'data': [
'security/ir.model.access.csv',
'hr_timesheet_invoice_data.xml',
'hr_timesheet_invoice_view.xml',
'hr_timesheet_invoice_wizard.xml',
'hr_timesheet_invoice_report.xml',
@@ -45,11 +45,12 @@ reports, eso.""",
'wizard/hr_timesheet_invoice_create_final_view.xml',
'board_hr_timesheet_invoice.xml',
],
'demo_xml': ['hr_timesheet_invoice_demo.xml',
],
'demo': [
'hr_timesheet_invoice_demo.xml',
],
'test': ['test/test_hr_timesheet_invoice.yml',
'test/hr_timesheet_invoice_report.yml',
],
],
'installable': True,
'active': False,
'certificate': '0056091842381',
addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
+4 -4
View File
@@ -11,7 +11,7 @@
<field name="view_mode">graph,tree</field>
</record>
<record id="board_hr_timesheet_invoice_form" model="ir.ui.view">
<!-- <record id="board_hr_timesheet_invoice_form" model="ir.ui.view">
<field name="name">board.hr.timesheet.invoice</field>
<field name="model">board.board</field>
<field name="type">form</field>
@@ -22,10 +22,10 @@
<action colspan="4" height="160" name="%(act_my_account)d" string="Accounts to invoice" width="510"/>
</xpath>
</field>
</record>
</record> -->
<!-- Need to merge in above view -->
<record id="board_hr_timesheet_invoice_report_form1" model="ir.ui.view">
<!--<record id="board_hr_timesheet_invoice_report_form1" model="ir.ui.view">
<field name="name">board.hr.timesheet.invoice</field>
<field name="model">board.board</field>
<field name="type">form</field>
@@ -35,7 +35,7 @@
<action colspan="4" height="220" name="%(action_account_analytic_line_to_invoice)d" string="Costs to invoice"/>
</xpath>
</field>
</record>
</record> -->
<record id="view_timesheet_uninvoiced_line_tree" model="ir.ui.view">
<field name="name">timesheet.uninvoiced.line.tree</field>
addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
<record id="timesheet_invoice_factor1" model="hr_timesheet_invoice.factor">
<field name="name">Yes (100%)</field>
<field name="customer_name">100%</field>
<field name="factor">0.0</field>
</record>
</data>
</openerp>
addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
-12
View File
@@ -1,36 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
<record id="timesheet_invoice_factor1" model="hr_timesheet_invoice.factor">
<field name="name">100%</field>
<field name="customer_name"/>
<field name="factor">0.0</field>
</record>
<record id="timesheet_invoice_factor2" model="hr_timesheet_invoice.factor">
<field name="name">50%</field>
<field name="customer_name">50% Discount</field>
<field name="factor">50.0</field>
</record>
<record id="timesheet_invoice_factor3" model="hr_timesheet_invoice.factor">
<field name="name">Gratis</field>
<field name="customer_name">Offered developments</field>
<field name="factor">100.0</field>
</record>
<record id="account.analytic_sednacom" model="account.analytic.account">
<field name="to_invoice" ref="timesheet_invoice_factor1"/>
</record>
<record id="account.analytic_thymbra" model="account.analytic.account">
<field name="to_invoice" ref="timesheet_invoice_factor1"/>
</record>
<record id="account.analytic_partners_camp_to_camp" model="account.analytic.account">
<field name="to_invoice" ref="timesheet_invoice_factor1"/>
</record>
</data>
</openerp>
addons/hr_timesheet_invoice/report/cost_ledger.py
+1 -1
View File
@@ -167,7 +167,7 @@ report_sxw.report_sxw(
'report.hr.timesheet.invoice.account.analytic.account.cost_ledger',
'account.analytic.account',
'addons/hr_timesheet_invoice/report/cost_ledger.rml',
parser=account_analytic_cost_ledger, header=False)
parser=account_analytic_cost_ledger, header='internal')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/mrp/i18n/ar.po
+1 -1
View File
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
addons/mrp/i18n/bg.po
+1 -1
View File
@@ -565,7 +565,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
addons/mrp/i18n/bs.po
+1 -1
View File
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
addons/mrp/i18n/ca.po
+1 -1
View File
@@ -584,7 +584,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Temps en hores per realitzar un cicle."
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Data final"
addons/mrp/i18n/cs.po
+1 -1
View File
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
addons/mrp/i18n/de.po
+1 -1
View File
@@ -585,7 +585,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Zeit in Stunden für einen (Auftrags-) Zyklus"
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Endedatum"
addons/mrp/i18n/el.po
+1 -1
View File
@@ -585,7 +585,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Χρόνος ενός κύκλου σε ώρες"
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Ημερ/νία Τέλους"
addons/mrp/i18n/es.po
+1 -1
View File
@@ -585,7 +585,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Tiempo en horas para realizar un ciclo."
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Fecha final"
addons/mrp/i18n/es_AR.po
+1 -1
View File
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
addons/mrp/i18n/es_EC.po
+1 -1
View File
@@ -585,7 +585,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Tiempo en horas para realizar un ciclo."
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Fecha final"
addons/mrp/i18n/et.po
+1 -1
View File
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Aeg tundides mis kulub ühes tsükklis."
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Lõppkuupäev"
addons/mrp/i18n/fi.po
+1 -1
View File
@@ -580,7 +580,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Yhden kierron kesto tunneissa."
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Lopetuspäivämäärä"
addons/mrp/i18n/fr.po
+1 -1
View File
@@ -600,7 +600,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Temps nécessaire à la réalisation d'un cycle"
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Date de fin"
addons/mrp/i18n/hi.po
+1 -1
View File
@@ -562,7 +562,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "समाप्ति तिथि"
addons/mrp/i18n/hr.po
+1 -1
View File
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
addons/mrp/i18n/hu.po
+1 -1
View File
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
addons/mrp/i18n/id.po
+1 -1
View File
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
addons/mrp/i18n/it.po
+1 -1
View File
@@ -586,7 +586,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Tempo in ore per completare un ciclo."
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Data di fine"
addons/mrp/i18n/ko.po
+1 -1
View File
@@ -567,7 +567,7 @@ msgid "Time in hours for doing one cycle."
msgstr "한 사이클을 수행하는 시간"
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "마감 날짜"
addons/mrp/i18n/lt.po
+1 -1
View File
@@ -575,7 +575,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Vieno ciklo laikas valandomis."
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Pabaigos data"
addons/mrp/i18n/mrp.pot
+1 -1
View File
@@ -546,7 +546,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
addons/mrp/i18n/nl.po
+1 -1
View File
@@ -584,7 +584,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Tijd in uren voor één productiecyclus."
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Einddatum"
addons/mrp/i18n/nl_BE.po
+1 -1
View File
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
addons/mrp/i18n/pl.po
+1 -1
View File
@@ -582,7 +582,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Czas wykonania jednego cyklu w godzinach"
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Data końcowa"
addons/mrp/i18n/pt.po
+1 -1
View File
@@ -564,7 +564,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Data de finalização"
addons/mrp/i18n/pt_BR.po
+1 -1
View File
@@ -567,7 +567,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Tempo em hora para fazer um ciclo."
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Data final"
addons/mrp/i18n/ro.po
+1 -1
View File
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
addons/mrp/i18n/ru.po
+1 -1
View File
@@ -567,7 +567,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Время в часах на выполнение одного цикла"
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Дата окончания"
addons/mrp/i18n/sk.po
+1 -1
View File
@@ -562,7 +562,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
addons/mrp/i18n/sl.po
+1 -1
View File
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Končni datum"
addons/mrp/i18n/sq.po
+1 -1
View File
@@ -562,7 +562,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
addons/mrp/i18n/sv.po
+1 -1
View File
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Slutdatum"
addons/mrp/i18n/tlh.po
+1 -1
View File
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
addons/mrp/i18n/tr.po
+1 -1
View File
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Bitiş Tarihi"
addons/mrp/i18n/uk.po
+1 -1
View File
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Кінцева дата"
addons/mrp/i18n/vi.po
+1 -1
View File
@@ -562,7 +562,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
addons/mrp/i18n/zh_CN.po
+1 -1
View File
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr "一个周期的工作小时数"
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "结束日期"
addons/mrp/i18n/zh_HK.po
+1 -1
View File
@@ -562,7 +562,7 @@ msgid "Time in hours for doing one cycle."
msgstr "一個循環所須的小時數"
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
addons/mrp/i18n/zh_TW.po
+1 -1
View File
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr "一個循環所須的小時數"
#. module: mrp
#: field:mrp.production,date_finnished:0
#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
addons/mrp/mrp.py
+2 -2
View File
@@ -456,7 +456,7 @@ class mrp_production(osv.osv):
'date_planned_date': fields.function(_production_date, method=True, type='date', string='Scheduled Date'),
'date_planned': fields.datetime('Scheduled date', required=True, select=1),
'date_start': fields.datetime('Start Date'),
'date_finnished': fields.datetime('End Date'),
'date_finished': fields.datetime('End Date'),
'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)]),
'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', help="The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan future loads on workcenters based on production plannification."),
@@ -658,7 +658,7 @@ class mrp_production(osv.osv):
"""
for production in self.browse(cr, uid, ids):
self._costs_generate(cr, uid, production)
return self.write(cr, uid, ids, {'state': 'done', 'date_finnished': time.strftime('%Y-%m-%d %H:%M:%S')})
return self.write(cr, uid, ids, {'state': 'done', 'date_finished': time.strftime('%Y-%m-%d %H:%M:%S')})
def test_production_done(self, cr, uid, ids):
""" Tests whether production is done or not.
addons/mrp/mrp_view.xml
+10 -10
View File
@@ -545,7 +545,7 @@
<field name="model">mrp.production</field>
<field name="type">gantt</field>
<field name="arch" type="xml">
<gantt color="product_id" date_stop="date_finnished" date_start="date_start" string="Productions">
<gantt color="product_id" date_stop="date_finished" date_start="date_start" string="Productions">
<level object="mrp.routing" link="routing_id" domain="[]">
<field name="name"/>
<field name="origin"/>
@@ -604,8 +604,8 @@
<tree colors="blue:state in ('draft');black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
<field name="product_id" />
<field name="product_qty" string="Qty"/>
<field name="product_uom" string="UOM"/>
<field name="location_id" string="Source Loc."/>
<field name="product_uom" string="UOM" widget="selection"/>
<field name="location_id" string="Source Loc." widget="selection"/>
<field name="state" invisible="1"/>
<button name="%(stock.move_consume)d"
string="Consume Products" type="action"
@@ -623,8 +623,8 @@
<tree colors="red:scrapped==True;blue:state in('draft');black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Consumed Products" editable="bottom">
<field name="product_id" readonly="1"/>
<field name="product_qty" readonly="1" string="Qty"/>
<field name="product_uom" readonly="1" string="UOM"/>
<field name="location_dest_id" readonly="1" string="Destination Loc."/>
<field name="product_uom" readonly="1" string="UOM" widget="selection"/>
<field name="location_dest_id" readonly="1" string="Destination Loc." widget="selection"/>
<field name="prodlot_id" />
<field name="state" invisible="1"/>
<field name="scrapped" invisible="1"/>
@@ -658,8 +658,8 @@
<tree string="Products to Finish">
<field name="product_id" />
<field name="product_qty" string="Qty"/>
<field name="product_uom" string="UOM"/>
<field name="location_id" string="Source Loc."/>
<field name="product_uom" string="UOM" widget="selection"/>
<field name="location_id" string="Source Loc." widget="selection"/>
<field name="state" invisible="1"/>
<button name="%(stock.move_scrap)d"
string="Scrap Products" type="action"
@@ -673,8 +673,8 @@
<tree colors="red:scrapped==True;blue:state in('draft');black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products" editable="bottom">
<field name="product_id" readonly="1"/>
<field name="product_qty" readonly="1" string="Qty"/>
<field name="product_uom" readonly="1" string="UOM"/>
<field name="location_dest_id" readonly="1" string="Destination Loc."/>
<field name="product_uom" readonly="1" string="UOM" widget="selection"/>
<field name="location_dest_id" readonly="1" string="Destination Loc." widget="selection"/>
<field name="prodlot_id" />
<field name="scrapped" invisible="1"/>
<button name="%(stock.track_line)d"
@@ -711,7 +711,7 @@
<field name="priority" groups="base.group_extended"/>
<newline/>
<field name="date_start"/>
<field name="date_finnished"/>
<field name="date_finished"/>
<field name="picking_id" groups="base.group_extended"/>
<field name="move_prod_id" groups="base.group_extended"/>
</page>
addons/mrp/report/custom_default.xsl
-4
View File
@@ -19,8 +19,6 @@
<drawString x="1.3cm" y="28.3cm"><xsl:value-of select="//date"/></drawString>
<setFont name="DejaVu Sans Bold" size="10"/>
<drawString x="9.8cm" y="28.3cm"><xsl:value-of select="//company"/></drawString>
<setFont name="DejaVu Sans" size="8"/>
<drawRightString x="19.7cm" y="28.3cm"><pageNumber/> / </drawRightString>
<stroke color="#000000"/>
<lines>1.3cm 28.1cm 20cm 28.1cm</lines>
@@ -35,8 +33,6 @@
<drawString x="1.3cm" y="28.3cm"><xsl:value-of select="//date"/></drawString>
<setFont name="DejaVu Sans Bold" size="10"/>
<drawString x="9.8cm" y="28.3cm"><xsl:value-of select="//company"/></drawString>
<setFont name="DejaVu Sans" size="8"/>
<drawRightString x="19.7cm" y="28.3cm"><pageNumber/> / </drawRightString>
<stroke color="#000000"/>
<lines>1.3cm 28.1cm 20cm 28.1cm</lines>
</xsl:template>
addons/mrp/report/mrp_production_order.py
+3 -3
View File
@@ -51,7 +51,7 @@ class mrp_production_order(osv.osv):
'date_planned':fields.date('Scheduled Date'),
'location_src_id': fields.many2one('stock.location', 'Raw Materials Location', readonly=True),
'date_start': fields.datetime('Start Date',readonly=True),
'date_finnished': fields.datetime('End Date',readonly=True),
'date_finished': fields.datetime('End Date',readonly=True),
'location_dest_id': fields.many2one('stock.location', 'Finished Products Location', readonly=True),
'company_id': fields.many2one('res.company','Company',readonly=True),
'bom_id': fields.many2one('mrp.bom', 'Bill of Material',readonly=True),
@@ -100,7 +100,7 @@ class mrp_production_order(osv.osv):
s.routing_id,
s.picking_id,
s.date_start,
s.date_finnished,
s.date_finished,
to_date(to_char(s.date_planned, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_planned,
s.origin,
s.priority,
@@ -128,7 +128,7 @@ class mrp_production_order(osv.osv):
to_date(to_char(s.date_planned, 'dd-MM-YYYY'),'dd-MM-YYYY'),
s.origin,
s.date_start,
s.date_finnished,
s.date_finished,
s.company_id
)""")
mrp_production_order()
addons/mrp/report/mrp_production_order_view.xml
+2 -2
View File
@@ -58,7 +58,7 @@
<filter icon="terp-go-week"
string="Month -1"
separator="1"
domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
domain="[('month','=',(datetime.date.today() - datetime.timedelta(365/12)).strftime('%%m'))]"
help="Production during last month"/>
<separator orientation="vertical"/>
<filter string="Current" icon="terp-check" domain="[('state','in',('open','draft'))]"/>
@@ -80,7 +80,7 @@
<newline/>
<field name="date_start"/>
<field name="date_planned"/>
<field name="date_finnished"/>
<field name="date_finished"/>
</group>
<newline/>
<group expand="1" string="Group By...">
addons/mrp/report/mrp_report_view.xml
+2 -1
View File
@@ -101,7 +101,8 @@
<field name="view_mode">graph,tree</field>
<field name="help">Weekly Stock Value Variation enables you to track stock value evolution as a result of manufacturing activities (consumption of raw materials, production of finished goods, added accounting value of stock by the creation of value following the transformation of products).</field>
</record>
<menuitem action="action_report_in_out_picking_tree" id="menu_report_in_out_picking" parent="next_id_77"/>
<menuitem action="action_report_in_out_picking_tree" id="menu_report_in_out_picking"
parent="next_id_77" groups="mrp.group_mrp_manager"/>
addons/mrp/security/ir.model.access.csv
+12 -8
View File
@@ -5,12 +5,14 @@
"access_mrp_bom","mrp.bom","model_mrp_bom","group_mrp_user",1,1,1,0
"access_mrp_bom_revision","mrp.bom.revision","model_mrp_bom_revision","group_mrp_user",1,0,0,0
"access_mrp_production","mrp.production user","model_mrp_production","mrp.group_mrp_user",1,1,1,1
"access_mrp_property_group","mrp.property.group","procurement.model_mrp_property_group","mrp.group_mrp_manager",1,1,1,1
"access_mrp_property","mrp.property","procurement.model_mrp_property","mrp.group_mrp_manager",1,1,1,1
"access_mrp_production_product_line","mrp.production.product.line","model_mrp_production_product_line","mrp.group_mrp_user",1,1,1,1
"access_procurement","procurement.order","model_procurement_order","mrp.group_mrp_user",1,1,1,1
"access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_manager",1,1,1,1
"access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_manager",1,0,0,0
"access_mrp_routing_manager","mrp.routing.manager","model_mrp_routing","mrp.group_mrp_manager",1,1,1,1
"access_mrp_routing_workcenter_manager","mrp.routing.workcenter.manager","model_mrp_routing_workcenter","mrp.group_mrp_manager",1,1,1,1
"access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_manager",1,0,0,0
"access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_manager",1,0,0,1
"access_mrp_bom_revision_manager","mrp.bom.revision.manager","model_mrp_bom_revision","mrp.group_mrp_manager",1,1,1,1
"access_stock_location_mrp_worker","stock.location mrp_worker","stock.model_stock_location","mrp.group_mrp_user",1,0,0,0
"access_stock_move_mrp_worker","stock.move mrp_worker","stock.model_stock_move","mrp.group_mrp_user",1,1,1,0
@@ -20,14 +22,15 @@
"access_account_account","account.account mrp_worker","account.model_account_account","mrp.group_mrp_user",1,0,0,0
"access_purchase_order_mrp_worker","purchase.order mrp_worker","purchase.model_purchase_order","mrp.group_mrp_user",1,1,1,1
"access_purchase_order_line_mrp_worker","purchase.order.line mrp_worker","purchase.model_purchase_order_line","mrp.group_mrp_user",1,0,0,0
"access_hr_timesheet_group_mrp_worker","resource.calendar mrp_worker","resource.model_resource_calendar","base.group_system",1,1,1,1
"access_hr_timesheet_group_mrp_worker","resource.calendar mrp_manager","resource.model_resource_calendar","mrp.group_mrp_manager",1,1,1,1
"access_procurement_stock_worker","procurement.order stock_worker","model_procurement_order","stock.group_stock_user",1,1,1,1
"access_procurement_user","procurement.order.user","model_procurement_order","base.group_user",1,1,1,1
"access_mrp_production_stock_worker","mrp.production stock_worker","model_mrp_production","stock.group_stock_user",1,0,0,0
"access_mrp_production_order","mrp.production.order","model_mrp_production_order","mrp.group_mrp_manager",1,1,1,1
"access_report_workcenter_load","report.workcenter.load","model_report_workcenter_load","mrp.group_mrp_manager",1,0,0,0
"access_report_mrp_inout","report.mrp.inout","model_report_mrp_inout","mrp.group_mrp_manager",1,0,0,0
"access_product_product_manager","product.product manager","model_product_product","mrp.group_mrp_manager",1,1,1,1
"access_report_workcenter_load","report.workcenter.load","model_report_workcenter_load","mrp.group_mrp_manager",1,1,1,1
"access_report_mrp_inout","report.mrp.inout","model_report_mrp_inout","mrp.group_mrp_manager",1,1,1,1
"access_product_product_manager","product.product manager","model_product_product","mrp.group_mrp_manager",1,0,0,0
"access_ir_property_manager","ir.property manager","base.model_ir_property","mrp.group_mrp_manager",1,1,1,1
"access_account_sequence_fiscalyear","account.sequence.fiscalyear","account.model_account_sequence_fiscalyear","mrp.group_mrp_user",1,1,1,1
"access_product_product_user","product.product user","model_product_product","mrp.group_mrp_user",1,1,1,1
"access_product_template_user","product.template user","product.model_product_template","mrp.group_mrp_user",1,1,1,1
@@ -39,6 +42,7 @@
"access_workcenter_user","mrp.production.workcenter.line.user","model_mrp_production_workcenter_line","mrp.group_mrp_user",1,1,1,1
"access_resource_calendar_leaves_user","mrp.resource.calendar.leaves.user","resource.model_resource_calendar_leaves","mrp.group_mrp_user",1,1,1,1
"access_resource_calendar_leaves_manager","mrp.resource.calendar.leaves.manager","resource.model_resource_calendar_leaves","mrp.group_mrp_manager",1,0,0,0
"access_resource_calendar_attendance_manager","mrp.resource.calendar.attendance.manager","resource.model_resource_calendar_attendance","mrp.group_mrp_manager",1,1,1,1
"access_product_puom_categ","product.uom.categ","product.model_product_uom_categ","mrp.group_mrp_user",1,1,1,0
"access_resource_resource","resource.resource","resource.model_resource_resource","mrp.group_mrp_user",1,1,1,0
"access_board_board_user","mrp.board.board","board.model_board_board","mrp.group_mrp_user",1,1,1,0
@@ -55,7 +59,7 @@
"access_mrp_production_manager","mrp.production manager","model_mrp_production","mrp.group_mrp_manager",1,0,0,0
"access_procurement_manager","procurement.order","model_procurement_order","mrp.group_mrp_manager",1,0,0,0
"access_workcenter_manager","mrp.production.workcenter.line","model_mrp_production_workcenter_line","mrp.group_mrp_manager",1,0,0,0
"access_stock_move_mrp_manager","stock.move mrp_manager","stock.model_stock_move","mrp.group_mrp_manager",1,0,0,0
"access_stock_move_mrp_manager","stock.move mrp_manager","stock.model_stock_move","mrp.group_mrp_manager",1,0,0,1
"access_mrp_production_product_line_manager","mrp.production.product.line manager","model_mrp_production_product_line","mrp.group_mrp_manager",1,0,0,0
"access_account_sequence_fiscalyear_system","account.sequence.fiscalyear.system","account.model_account_sequence_fiscalyear","mrp.group_mrp_manager",1,0,0,0
"access_product_template_system","product.template mgr.system","product.model_product_template","base.group_system",1,0,0,0
@@ -87,6 +91,6 @@
"access_mrp_production_system","mrp.production system","model_mrp_production","base.group_system",1,0,0,0
"access_stock_production_lot_user","stock.production.lot","stock.model_stock_production_lot","mrp.group_mrp_user",1,1,1,1
"access_stock_warehouse_orderpoint_manager","stock.warehouse.orderpoint","procurement.model_stock_warehouse_orderpoint","mrp.group_mrp_manager",1,0,0,0
"access_stock_picking_mrp_manager","stock.picking mrp_manager","stock.model_stock_picking","mrp.group_mrp_manager",1,1,1,1
"access_stock_picking_mrp_manager","stock.picking mrp_manager","stock.model_stock_picking","mrp.group_mrp_manager",1,0,0,0
"access_report_mrp_inout_user","report.mrp.inout user","model_report_mrp_inout","mrp.group_mrp_user",1,0,0,0
"access_report_workcenter_load_user","report.workcenter.load.user","model_report_workcenter_load","mrp.group_mrp_user",1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
5 access_mrp_bom mrp.bom model_mrp_bom group_mrp_user 1 1 1 0
6 access_mrp_bom_revision mrp.bom.revision model_mrp_bom_revision group_mrp_user 1 0 0 0
7 access_mrp_production mrp.production user model_mrp_production mrp.group_mrp_user 1 1 1 1
8 access_mrp_property_group mrp.property.group procurement.model_mrp_property_group mrp.group_mrp_manager 1 1 1 1
9 access_mrp_property mrp.property procurement.model_mrp_property mrp.group_mrp_manager 1 1 1 1
10 access_mrp_production_product_line mrp.production.product.line model_mrp_production_product_line mrp.group_mrp_user 1 1 1 1
11 access_procurement procurement.order model_procurement_order mrp.group_mrp_user 1 1 1 1
12 access_mrp_workcenter_manager mrp.workcenter.manager model_mrp_workcenter mrp.group_mrp_manager 1 1 0 1 0 1 0
13 access_mrp_routing_manager mrp.routing.manager model_mrp_routing mrp.group_mrp_manager 1 1 1 1
14 access_mrp_routing_workcenter_manager mrp.routing.workcenter.manager model_mrp_routing_workcenter mrp.group_mrp_manager 1 1 1 1
15 access_mrp_bom_manager mrp.bom.manager model_mrp_bom mrp.group_mrp_manager 1 0 0 0 1
16 access_mrp_bom_revision_manager mrp.bom.revision.manager model_mrp_bom_revision mrp.group_mrp_manager 1 1 1 1
17 access_stock_location_mrp_worker stock.location mrp_worker stock.model_stock_location mrp.group_mrp_user 1 0 0 0
18 access_stock_move_mrp_worker stock.move mrp_worker stock.model_stock_move mrp.group_mrp_user 1 1 1 0
22 access_account_account account.account mrp_worker account.model_account_account mrp.group_mrp_user 1 0 0 0
23 access_purchase_order_mrp_worker purchase.order mrp_worker purchase.model_purchase_order mrp.group_mrp_user 1 1 1 1
24 access_purchase_order_line_mrp_worker purchase.order.line mrp_worker purchase.model_purchase_order_line mrp.group_mrp_user 1 0 0 0
25 access_hr_timesheet_group_mrp_worker resource.calendar mrp_worker resource.calendar mrp_manager resource.model_resource_calendar base.group_system mrp.group_mrp_manager 1 1 1 1
26 access_procurement_stock_worker procurement.order stock_worker model_procurement_order stock.group_stock_user 1 1 1 1
27 access_procurement_user procurement.order.user model_procurement_order base.group_user 1 1 1 1
28 access_mrp_production_stock_worker mrp.production stock_worker model_mrp_production stock.group_stock_user 1 0 0 0
29 access_mrp_production_order mrp.production.order model_mrp_production_order mrp.group_mrp_manager 1 1 1 1
30 access_report_workcenter_load report.workcenter.load model_report_workcenter_load mrp.group_mrp_manager 1 0 1 0 1 0 1
31 access_report_mrp_inout report.mrp.inout model_report_mrp_inout mrp.group_mrp_manager 1 0 1 0 1 0 1
32 access_product_product_manager product.product manager model_product_product mrp.group_mrp_manager 1 1 0 1 0 1 0
33 access_ir_property_manager ir.property manager base.model_ir_property mrp.group_mrp_manager 1 1 1 1
34 access_account_sequence_fiscalyear account.sequence.fiscalyear account.model_account_sequence_fiscalyear mrp.group_mrp_user 1 1 1 1
35 access_product_product_user product.product user model_product_product mrp.group_mrp_user 1 1 1 1
36 access_product_template_user product.template user product.model_product_template mrp.group_mrp_user 1 1 1 1
42 access_workcenter_user mrp.production.workcenter.line.user model_mrp_production_workcenter_line mrp.group_mrp_user 1 1 1 1
43 access_resource_calendar_leaves_user mrp.resource.calendar.leaves.user resource.model_resource_calendar_leaves mrp.group_mrp_user 1 1 1 1
44 access_resource_calendar_leaves_manager mrp.resource.calendar.leaves.manager resource.model_resource_calendar_leaves mrp.group_mrp_manager 1 0 0 0
45 access_resource_calendar_attendance_manager mrp.resource.calendar.attendance.manager resource.model_resource_calendar_attendance mrp.group_mrp_manager 1 1 1 1
46 access_product_puom_categ product.uom.categ product.model_product_uom_categ mrp.group_mrp_user 1 1 1 0
47 access_resource_resource resource.resource resource.model_resource_resource mrp.group_mrp_user 1 1 1 0
48 access_board_board_user mrp.board.board board.model_board_board mrp.group_mrp_user 1 1 1 0
59 access_mrp_production_manager mrp.production manager model_mrp_production mrp.group_mrp_manager 1 0 0 0
60 access_procurement_manager procurement.order model_procurement_order mrp.group_mrp_manager 1 0 0 0
61 access_workcenter_manager mrp.production.workcenter.line model_mrp_production_workcenter_line mrp.group_mrp_manager 1 0 0 0
62 access_stock_move_mrp_manager stock.move mrp_manager stock.model_stock_move mrp.group_mrp_manager 1 0 0 0 1
63 access_mrp_production_product_line_manager mrp.production.product.line manager model_mrp_production_product_line mrp.group_mrp_manager 1 0 0 0
64 access_account_sequence_fiscalyear_system account.sequence.fiscalyear.system account.model_account_sequence_fiscalyear mrp.group_mrp_manager 1 0 0 0
65 access_product_template_system product.template mgr.system product.model_product_template base.group_system 1 0 0 0
91 access_mrp_production_system mrp.production system model_mrp_production base.group_system 1 0 0 0
92 access_stock_production_lot_user stock.production.lot stock.model_stock_production_lot mrp.group_mrp_user 1 1 1 1
93 access_stock_warehouse_orderpoint_manager stock.warehouse.orderpoint procurement.model_stock_warehouse_orderpoint mrp.group_mrp_manager 1 0 0 0
94 access_stock_picking_mrp_manager stock.picking mrp_manager stock.model_stock_picking mrp.group_mrp_manager 1 1 0 1 0 1 0
95 access_report_mrp_inout_user report.mrp.inout user model_report_mrp_inout mrp.group_mrp_user 1 0 0 0
96 access_report_workcenter_load_user report.workcenter.load.user model_report_workcenter_load mrp.group_mrp_user 1 0 0 0
addons/mrp/test/mrp_phantom_bom.yml
-11
View File
@@ -230,17 +230,6 @@
wf_service = netsvc.LocalService("workflow")
for p_id in purch_ids:
wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
-
I get the approval from both the suppliers. So I approve my purchase orders.
-
!python {model: purchase.order}: |
from tools.translate import _
import netsvc
purch_ids = self.search(cr, uid, [('state','=','confirmed')])
assert purch_ids, _('No Confirmed Purchase Orders found!')
wf_service = netsvc.LocalService("workflow")
for p_id in purch_ids:
wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_approve', cr)
-
I see two incoming pickings for Orange and Sugar.
-
addons/mrp/test/mrp_procurement.yml
+2 -22
View File
@@ -178,17 +178,7 @@
wf_service = netsvc.LocalService("workflow")
for p_id in purch_ids:
wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
-
I get the approval from the supplier. So I approve my purchase orders.
-
!python {model: purchase.order}: |
from tools.translate import _
import netsvc
purch_ids = self.search(cr, uid, [('state','=','confirmed')])
assert purch_ids, _('No Confirmed Purchase Orders found!')
wf_service = netsvc.LocalService("workflow")
for p_id in purch_ids:
wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_approve', cr)
-
I confirm purchase order for Buttons.
-
@@ -198,17 +188,7 @@
wf_service = netsvc.LocalService("workflow")
for p_id in purch_ids:
wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
-
I get the approval from the supplier. So I approve my purchase orders.
-
!python {model: purchase.order}: |
from tools.translate import _
import netsvc
purch_ids = self.search(cr, uid, [('state','=','confirmed')])
assert purch_ids, _('No Confirmed Purchase Orders found!')
wf_service = netsvc.LocalService("workflow")
for p_id in purch_ids:
wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_approve', cr)
-
I Check incoming shipments for cloth. And receive products.
-
addons/mrp/wizard/change_production_qty.py
+3 -3
View File
@@ -87,10 +87,10 @@ class change_production_qty(osv.osv_memory):
factor = prod.product_qty * prod.product_uom.factor / bom_point.product_uom.factor
res = bom_obj._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, [])
for r in res[0]:
if r['product_id']== move.product_id.id:
move_lines_obj.write(cr, uid,move.id, {'product_qty' : r['product_qty']})
if r['product_id'] == move.product_id.id:
move_lines_obj.write(cr, uid, [move.id], {'product_qty' : r['product_qty']})
for m in prod.move_created_ids:
move_lines_obj.write(cr, uid,m.id, {'product_qty': wiz_qty.product_qty})
move_lines_obj.write(cr, uid, [m.id], {'product_qty': wiz_qty.product_qty})
return {}
addons/mrp_operations/i18n/ar.po
+1 -1
View File
@@ -246,7 +246,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
#: field:mrp.production.workcenter.line,date_finnished:0
#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
addons/mrp_operations/i18n/bg.po
+1 -1
View File
@@ -248,7 +248,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
#: field:mrp.production.workcenter.line,date_finnished:0
#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
addons/mrp_operations/i18n/bs.po
+1 -1
View File
@@ -246,7 +246,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
#: field:mrp.production.workcenter.line,date_finnished:0
#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"

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