openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #00082
lp:~openerp-dev/openobject-addons/openobject-remove_commented_code into lp:~openerp-dev/openobject-addons/openobject-clean
rvo(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/openobject-remove_commented_code into lp:~openerp-dev/openobject-addons/openobject-clean.
Requested reviews:
OpenERP Core Team (openerp)
--
The attached diff has been truncated due to its size.
https://code.launchpad.net/~openerp-dev/openobject-addons/openobject-remove_commented_code/+merge/32581
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/openobject-remove_commented_code.
=== modified file 'l10n_fr/__openerp__.py'
--- l10n_fr/__openerp__.py 2010-08-10 11:35:06 +0000
+++ l10n_fr/__openerp__.py 2010-08-13 13:36:19 +0000
@@ -36,8 +36,7 @@
Credits: Sistheo Zeekom CrysaLEAD
""",
"depends" : ['base', 'account', 'account_chart', 'account_report', 'base_vat'],
- "init_xml" : [
- ],
+ "init_xml" : [],
"update_xml" : [
"report.xml",
"pcg.xml",
=== modified file 'l10n_fr/l10n_fr.py'
--- l10n_fr/l10n_fr.py 2010-02-24 10:55:29 +0000
+++ l10n_fr/l10n_fr.py 2010-08-13 13:36:19 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -35,8 +35,8 @@
'line_ids': fields.one2many('l10n.fr.line', 'report_id', 'Lines'),
}
_sql_constraints = [
- ('code_uniq', 'unique (code)','The code report must be unique !')
- ]
+ ('code_uniq', 'unique (code)','The code report must be unique !')
+ ]
l10n_fr_report()
class l10n_fr_line(osv.osv):
@@ -49,7 +49,7 @@
'report_id': fields.many2one('l10n.fr.report', 'Report'),
}
_sql_constraints = [
- ('code_uniq', 'unique (code)', 'The variable name must be unique !')
+ ('code_uniq', 'unique (code)', 'The variable name must be unique !')
]
l10n_fr_line()
=== modified file 'l10n_fr/l10n_fr_pcg_view.xml'
--- l10n_fr/l10n_fr_pcg_view.xml 2009-01-22 13:00:17 +0000
+++ l10n_fr/l10n_fr_pcg_view.xml 2010-08-13 13:36:19 +0000
@@ -1,8 +1,5 @@
<?xml version="1.0"?>
<openerp>
<data>
-<!-- <menuitem name="Compte de resultat" parent="l10n_fr.menu_l10n_fr_report_doc" id="menu_action_cdr" action="wizard_l10n_fr_pcg_cdr_report" type="wizard" />-->
-<!---->
-<!-- <menuitem name="Bilan" id="menu_action_bilan" parent="l10n_fr.menu_l10n_fr_report_doc" action="wizard_l10n_fr_pcg_bilan_report" type="wizard" />-->
</data>
</openerp>
=== modified file 'l10n_fr/pcg.xml'
--- l10n_fr/pcg.xml 2010-08-04 11:51:18 +0000
+++ l10n_fr/pcg.xml 2010-08-13 13:36:19 +0000
@@ -14,7 +14,6 @@
<record id="account_type_dettes" model="account.account.type">
<field name="name">Dettes long terme</field>
<field name="code">dettes</field>
- <!-- <field name="report_type">?</field> -->
<field name="close_method">balance</field>
</record>
@@ -35,7 +34,6 @@
<record id="account_type_cloture" model="account.account.type">
<field name="name">Cloture</field>
<field name="code">cloture</field>
- <!-- <field name="report_type">?</field> -->
<field name="close_method">balance</field>
</record>
@@ -76,7 +74,6 @@
<record model="account.account.type" id="account_type_tax">
<field name="name">Tax</field>
<field name="code">tax</field>
- <!-- <field name="report_type">?</field> -->
<field name="close_method">unreconciled</field>
</record>
@@ -104,14 +101,12 @@
<record model="account.account.type" id="account_type_provision">
<field name="name">Provisions</field>
<field name="code">provision</field>
- <!-- <field name="report_type">?</field> -->
<field name="close_method">balance</field>
</record>
<record model="account.account.type" id="account_type_commitment">
<field name="name">Engagements</field>
<field name="code">commitment</field>
- <!-- <field name="report_type">?</field> -->
<field name="close_method">balance</field>
</record>
@@ -125,7 +120,6 @@
<record model="account.account.type" id="account_type_special">
<field name="name">Comptes spéciaux</field>
<field name="code">special</field>
- <!-- <field name="report_type">?</field> -->
<field name="close_method">none</field>
</record>
@@ -9255,49 +9249,5 @@
<field name="parent_id" ref="pcg_89"/>
</record>
-
- <!-- <record model="ir.property" id="account.property_account_receivable">
- <field name="value" eval="'account.account,'+str(ref('account.a_recv'))"/>
- </record>
-
- <record model="ir.property" id="account.property_account_payable">
- <field name="value" eval="'account.account,'+str(ref('account.a_pay'))"/>
- </record>
-
- <record model="ir.property" id="account.property_account_expense_categ">
- <field name="value" eval="'account.account,'+str(ref('account.a_expense'))"/>
- </record>
-
- <record model="ir.property" id="account.property_account_income_categ">
- <field name="value" eval="'account.account,'+str(ref('account.a_sale'))"/>
- </record>
-
- <record model="account.journal" id="l10n_fr.opening_journal">
- <field name="default_debit_account_id" ref="pcg_890"/>
- <field name="default_credit_account_id" ref="pcg_890"/>
- </record>
-
- <record model="account.journal" id="l10n_fr.closing_journal">
- <field name="default_debit_account_id" ref="pcg_891"/>
- <field name="default_credit_account_id" ref="pcg_891"/>
- </record>
-
- <record model="ir.values" id="l10n_fr.pl_credit">
- <field name="name">pl_credit</field>
- <field name="key">default</field>
- <field name="key2" eval="None"/>
- <field name="object" eval="False"/>
- <field name="model">wizard.l10n.fr.fiscalyear.close</field>
- <field name="value" eval="'I'+str(ref('pcg_120'))+chr(10)+'.'"/>
- </record>
-
- <record model="ir.values" id="l10n_fr.pl_debit">
- <field name="name">pl_debit</field>
- <field name="key">default</field>
- <field name="key2" eval="None"/>
- <field name="object" eval="False"/>
- <field name="model">wizard.l10n.fr.fiscalyear.close</field>
- <field name="value" eval="'I'+str(ref('pcg_129'))+chr(10)+'.'"/>
- </record> -->
</data>
</openerp>
=== modified file 'l10n_fr/report.xml'
--- l10n_fr/report.xml 2009-01-22 13:00:17 +0000
+++ l10n_fr/report.xml 2010-08-13 13:36:19 +0000
@@ -504,9 +504,6 @@
<record id="pcg_bpvar10" model="l10n.fr.line">
<field name="name">Capitaux propres : Résultat de l'exercice</field>
- <!--
- <field name="definition">{'load':['-:120:S','-:129:S'], 'except':[]}</field>
- -->
<field name="definition">{'load':['-:7:S','-:6:S'], 'except':[]}</field>
<field name="code">bpvar10</field>
<field name="report_id" ref="pcg_bilan"/>
=== modified file 'l10n_fr/report/base_report.py'
--- l10n_fr/report/base_report.py 2010-06-16 11:51:39 +0000
+++ l10n_fr/report/base_report.py 2010-08-13 13:36:19 +0000
@@ -32,7 +32,7 @@
class base_report(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
super(base_report, self).__init__(cr, uid, name, context=context)
- self.localcontext.update( {
+ self.localcontext.update({
'time': time,
'_load': self._load,
'_get_variable': self._get_variable,
@@ -62,7 +62,6 @@
return self.localcontext[variable]
def _load_accounts(self,form,code,definition,fiscalyear,period_query_cond):
- #self.context.copy()
accounts={}
for x in definition['load']:
p=x.split(":")
=== modified file 'l10n_in/account_chart.xml'
--- l10n_in/account_chart.xml 2010-05-20 15:26:15 +0000
+++ l10n_in/account_chart.xml 2010-08-13 13:36:19 +0000
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<openerp>
<data>
- <!--
+ <!--
#
# Indian Accounts tree
#
@@ -29,7 +29,7 @@
<field name="code">liability</field>
<field name="report_type">liability</field>
</record>
-
+
<record model="account.account.type" id="account_type_root_ind1">
<field name="name">View</field>
<field name="code">view</field>
@@ -58,17 +58,17 @@
<field name="name">Closed</field>
<field name="code">closed</field>
</record>
-
+
<!-- ## account chart -->
-
+
<record model="account.account.template" id="root">
<field name="name">Indian Chart of Account</field>
<field name="code">0</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_root_ind1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
</record>
<record model="account.account.template" id="IA_AC0">
@@ -76,131 +76,119 @@
<field name="code">IA_AC0</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_root_ind1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="root"/>
</record>
-
+
<record model="account.account.template" id="IA_AC01">
<field name="name">Assets</field>
<field name="code">IA_AC01</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_asset_view"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC0"/>
</record>
-
+
<record model="account.account.template" id="IA_AC011">
<field name="name">Current Assets</field>
<field name="code">IA_AC011</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_asset1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC01"/>
</record>
-
+
<record model="account.account.template" id="IA_AC0111">
<field name="name">Bank Account</field>
<field name="code">IA_AC0111</field>
<field name="type">receivable</field>
<field name="user_type" ref="account_type_asset1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC011"/>
</record>
-
+
<record model="account.account.template" id="IA_AC0112">
<field name="name">Cash In Hand Account</field>
<field name="code">IA_AC0112</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_asset1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC011"/>
</record>
-
+
<record model="account.account.template" id="IA_AC01121">
<field name="name">Cash Account</field>
<field name="code">IA_AC01121</field>
<field name="type">receivable</field>
<field name="user_type" ref="account_type_asset1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC0112"/>
</record>
-
+
<record model="account.account.template" id="IA_AC0113">
<field name="name">Deposit Account</field>
<field name="code">IA_AC0113</field>
<field name="type">receivable</field>
<field name="user_type" ref="account_type_asset1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC011"/>
</record>
-
+
<record model="account.account.template" id="IA_AC0114">
<field name="name">Loan & Advance(Assets) Account</field>
<field name="code">IA_AC0114</field>
<field name="type">receivable</field>
<field name="user_type" ref="account_type_asset1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC011"/>
</record>
-
-<!-- <record model="account.account.template" id="IA_AC0115">-->
-<!-- <field name="name">Stock In Hand Account</field>-->
-<!-- <field name="code">IA_AC0115</field>-->
-<!-- <field name="type">receivable</field>-->
-<!-- <field name="user_type" ref="account_type_asset1"/>
- -->
-<!-- <field name="reconcile" eval="False"/>-->
-<!-- -->
-<!-- <field name="parent_id" ref="IA_AC011"/>-->
-<!-- </record>-->
<record model="account.account.template" id="IA_AC0116">
<field name="name">Total Sundry Debtors Account</field>
<field name="code">IA_AC0116</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_asset1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC011"/>
</record>
-
<record model="account.account.template" id="IA_AC01161">
<field name="name">Sundry Debtors Account</field>
<field name="code">IA_AC01161</field>
<field name="type">receivable</field>
<field name="user_type" ref="account_type_asset1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC0116"/>
</record>
-
+
<record model="account.account.template" id="IA_AC012">
<field name="name">Fixed Assets</field>
<field name="code">IA_AC012</field>
<field name="type">receivable</field>
<field name="user_type" ref="account_type_asset1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC01"/>
</record>
@@ -209,9 +197,9 @@
<field name="code">IA_AC013</field>
<field name="type">receivable</field>
<field name="user_type" ref="account_type_asset1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC01"/>
</record>
@@ -220,54 +208,54 @@
<field name="code">IA_AC014</field>
<field name="type">receivable</field>
<field name="user_type" ref="account_type_asset1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC01"/>
</record>
-
-
+
+
<record model="account.account.template" id="IA_AC02">
<field name="name">Liabilities</field>
<field name="code">IA_AC02</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_liability_view"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC0"/>
</record>
-
+
<record model="account.account.template" id="IA_AC021">
<field name="name">Current Liabilities</field>
<field name="code">IA_AC021</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_liability1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC02"/>
</record>
-
+
<record model="account.account.template" id="IA_AC0211">
<field name="name">Duties & Taxes</field>
<field name="code">IA_AC0211</field>
<field name="type">payable</field>
<field name="user_type" ref="account_type_liability1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC021"/>
</record>
-
+
<record model="account.account.template" id="IA_AC0212">
<field name="name">Provision</field>
<field name="code">IA_AC0212</field>
<field name="type">payable</field>
<field name="user_type" ref="account_type_liability1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC021"/>
</record>
@@ -276,20 +264,20 @@
<field name="code">IA_AC0213</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_liability1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC021"/>
</record>
-
+
<record model="account.account.template" id="IA_AC02131">
<field name="name">Sundry Creditors</field>
<field name="code">IA_AC02131</field>
<field name="type">payable</field>
<field name="user_type" ref="account_type_liability1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC0213"/>
</record>
@@ -298,154 +286,154 @@
<field name="code">IA_AC022</field>
<field name="type">payable</field>
<field name="user_type" ref="account_type_liability1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC02"/>
</record>
-
+
<record model="account.account.template" id="IA_AC023">
<field name="name">Share Holder/Owner Fund</field>
<field name="code">IA_AC023</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_liability1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC02"/>
</record>
-
-
+
+
<record model="account.account.template" id="IA_AC0231">
<field name="name">Capital Account</field>
<field name="code">IA_AC0231</field>
<field name="type">payable</field>
<field name="user_type" ref="account_type_liability1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC023"/>
</record>
-
+
<record model="account.account.template" id="IA_AC0232">
<field name="name">Reserve and Surplus Account</field>
<field name="code">IA_AC0232</field>
<field name="type">payable</field>
<field name="user_type" ref="account_type_liability1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC023"/>
</record>
-
+
<record model="account.account.template" id="IA_AC024">
<field name="name">Loan(Liability) Account</field>
<field name="code">IA_AC024</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_liability1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC02"/>
</record>
-
+
<record model="account.account.template" id="IA_AC0241">
<field name="name">Bank OD Account</field>
<field name="code">IA_AC0241</field>
<field name="type">payable</field>
<field name="user_type" ref="account_type_liability1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC024"/>
</record>
-
+
<record model="account.account.template" id="IA_AC0242">
<field name="name">Secured Loan Account</field>
<field name="code">IA_AC0242</field>
<field name="type">payable</field>
<field name="user_type" ref="account_type_liability1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC024"/>
</record>
-
+
<record model="account.account.template" id="IA_AC0243">
<field name="name">Unsecured Loan Account</field>
<field name="code">IA_AC0243</field>
<field name="type">payable</field>
<field name="user_type" ref="account_type_liability1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC024"/>
</record>
-
+
<record model="account.account.template" id="IA_AC025">
<field name="name">Suspense Account</field>
<field name="code">IA_AC025</field>
<field name="type">payable</field>
<field name="user_type" ref="account_type_liability1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC02"/>
</record>
-
+
<record model="account.account.template" id="IA_AC1">
<field name="name">Profit And Loss Account</field>
<field name="code">IA_AC1</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_root_ind1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="root"/>
</record>
-
+
<record model="account.account.template" id="IA_AC11">
<field name="name">Expense</field>
<field name="code">IA_AC11</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_expense_view"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC1"/>
</record>
-
+
<record model="account.account.template" id="IA_AC111">
<field name="name">Direct Expenses</field>
<field name="code">IA_AC111</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_expense1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC11"/>
</record>
-
+
<record model="account.account.template" id="IA_AC112">
<field name="name">Indirect Expenses</field>
<field name="code">IA_AC112</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_expense1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC11"/>
</record>
-
+
<record model="account.account.template" id="IA_AC113">
<field name="name">Purchase</field>
<field name="code">IA_AC113</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_expense1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC11"/>
</record>
<record model="account.account.template" id="IA_AC114">
@@ -453,54 +441,54 @@
<field name="code">IA_AC114</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_expense1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC11"/>
</record>
-
+
<record model="account.account.template" id="IA_AC12">
<field name="name">Income</field>
<field name="code">IA_AC12</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_income_view"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC1"/>
</record>
-
+
<record model="account.account.template" id="IA_AC121">
<field name="name">Direct Incomes</field>
<field name="code">IA_AC121</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_income1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC12"/>
</record>
-
+
<record model="account.account.template" id="IA_AC122">
<field name="name">Indirect Incomes</field>
<field name="code">IA_AC122</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_income1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC12"/>
</record>
-
+
<record model="account.account.template" id="IA_AC123">
<field name="name">Sales Account</field>
<field name="code">IA_AC123</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_income1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC12"/>
</record>
<record model="account.account.template" id="IA_AC124">
@@ -508,52 +496,52 @@
<field name="code">IA_AC124</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_income1"/>
-
+
<field name="reconcile" eval="False"/>
-
+
<field name="parent_id" ref="IA_AC12"/>
</record>
- <!-- Tax detail -->
-
+ <!-- Tax detail -->
+
<record model="account.tax.code.template" id="vat_code_tax1">
<field name="name">Tax</field>
</record>
-
+
<record model="account.tax.code.template" id="vat_code_balance_net">
<field name="name">Tax Balance to Pay</field>
<field name="parent_id" ref="vat_code_tax1"/>
</record>
-
+
<record model="account.tax.code.template" id="vat_code_due_tva">
<field name="name">Tax Due (Tax to pay)</field>
<field name="parent_id" ref="vat_code_balance_net"/>
</record>
-
+
<record model="account.tax.code.template" id="vat_code_payable">
<field name="name">Tax Payable</field>
<field name="parent_id" ref="vat_code_balance_net"/>
</record>
-
+
<record model="account.tax.code.template" id="vat_code_base_net">
<field name="name">Tax Bases</field>
<field name="parent_id" ref="vat_code_tax1"/>
</record>
-
-
+
+
<record model="account.tax.code.template" id="vat_code_base_due">
<field name="name">Base of Taxed Sales</field>
<field name="parent_id" ref="vat_code_base_net"/>
</record>
-
-
+
+
<record model="account.tax.code.template" id="vat_code_receivable_net">
<field name="name">Base of Taxed Purchases</field>
<field name="parent_id" ref="vat_code_base_net"/>
</record>
-
-
-
+
+
+
<record id="opening_journal" model="account.journal">
<field name="name">Opening Journal</field>
<field name="code">OPJ</field>
@@ -562,14 +550,14 @@
<field name="sequence_id" ref="account.sequence_journal"/>
<field name="user_id" ref="base.user_root"/>
</record>
-
+
<record id="cose_journal_opening" model="account.analytic.journal">
<field name="code">OPJ</field>
<field name="name">Opening Journal</field>
<field name="type">situation</field>
</record>
-
-
+
+
<!-- Chart template -->
<record id="indian_chart_template" model="account.chart.template">
<field name="name">India - Chart of Accounts </field>
@@ -581,7 +569,7 @@
<field name="property_account_expense_categ" ref="IA_AC112"/>
<field name="property_account_income_categ" ref="IA_AC122"/>
</record>
-
+
</data>
</openerp>
=== modified file 'l10n_lu/l10n_lu_data.xml'
--- l10n_lu/l10n_lu_data.xml 2010-08-04 13:08:21 +0000
+++ l10n_lu/l10n_lu_data.xml 2010-08-13 13:36:19 +0000
@@ -24,7 +24,6 @@
<record id="account_type_creances" model="account.account.type">
<field name="name">Créances</field>
<field name="code">creances</field>
- <!-- <field name="report_type">?</field> -->
<field name="close_method">balance</field>
</record>
<record id="account_type_cash_equity" model="account.account.type">
@@ -57,7 +56,7 @@
<record id="account_lu_0" model="account.account.template">
<field name="code">0</field>
<field name="name">Plan KLUWER</field>
- <field name="type" >view</field>
+ <field name="type" >view</field>
<field name="user_type" ref="account_type_root"/>
</record>
@@ -65,7 +64,7 @@
<field name="code">1</field>
<field name="name">Fonds propres, prov. & dettes + d'1an</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_lu_0"/>
<field name="type" >view</field>
</record>
@@ -73,7 +72,7 @@
<field name="code">2</field>
<field name="name">Immobilis., dettes & créances à + d'1 an</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_lu_0"/>
<field name="type" >view</field>
</record>
@@ -81,7 +80,7 @@
<field name="code">3</field>
<field name="name">Stocks et commandes en cours d'exécution</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_lu_0"/>
<field name="type" >view</field>
</record>
@@ -89,7 +88,7 @@
<field name="code">4</field>
<field name="name">Créances et dettes à un an au plus</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_lu_0"/>
<field name="type" >view</field>
</record>
@@ -97,7 +96,7 @@
<field name="code">5</field>
<field name="name">Placements de trésorerie et disponible</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_lu_0"/>
<field name="type" >view</field>
</record>
@@ -105,7 +104,7 @@
<field name="code">6</field>
<field name="name">Charges</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_lu_0"/>
<field name="type" >view</field>
</record>
@@ -113,7 +112,7 @@
<field name="code">7</field>
<field name="name">Produits</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_lu_0"/>
<field name="type">view</field>
</record>
@@ -121,7 +120,7 @@
<field name="code">10</field>
<field name="name">Capital</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_1"/>
<field name="type" >view</field>
</record>
@@ -129,7 +128,7 @@
<field name="code">12</field>
<field name="name">Plus-values de réévaluation</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_1"/>
<field name="type" >view</field>
</record>
@@ -137,7 +136,7 @@
<field name="code">13</field>
<field name="name">Réserves</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_1"/>
<field name="type" >view</field>
</record>
@@ -145,7 +144,7 @@
<field name="code">14</field>
<field name="name">Résultat reporté</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_1"/>
<field name="type" >view</field>
</record>
@@ -153,7 +152,7 @@
<field name="code">15</field>
<field name="name">Subsides en capital</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_1"/>
<field name="type" >view</field>
</record>
@@ -161,7 +160,7 @@
<field name="code">16</field>
<field name="name">Provisions et impôts différés</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_1"/>
<field name="type" >view</field>
</record>
@@ -169,7 +168,7 @@
<field name="code">17</field>
<field name="name">Dettes à plus d'un an</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_1"/>
<field name="type" >view</field>
</record>
@@ -177,7 +176,7 @@
<field name="code">20</field>
<field name="name">Frais d'établissement</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_2"/>
<field name="type" >view</field>
</record>
@@ -185,7 +184,7 @@
<field name="code">21</field>
<field name="name">Immobilisations incorporelles</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_2"/>
<field name="type" >view</field>
</record>
@@ -193,7 +192,7 @@
<field name="code">22</field>
<field name="name">Terrains et constructions</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_2"/>
<field name="type" >view</field>
</record>
@@ -201,7 +200,7 @@
<field name="code">23</field>
<field name="name">Installations, machines et outillages</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_2"/>
<field name="type" >view</field>
</record>
@@ -209,7 +208,7 @@
<field name="code">24</field>
<field name="name">Mobilier et matériel roulant</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_2"/>
<field name="type" >view</field>
</record>
@@ -217,7 +216,7 @@
<field name="code">25</field>
<field name="name">Immobilisation détenues en loc.-fin.</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_2"/>
<field name="type" >view</field>
</record>
@@ -225,7 +224,7 @@
<field name="code">27</field>
<field name="name">Immobilis. corp. en cours & acptes versé</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_2"/>
<field name="type" >view</field>
</record>
@@ -233,7 +232,7 @@
<field name="code">28</field>
<field name="name">Immobilisations financières</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_2"/>
<field name="type" >view</field>
</record>
@@ -241,7 +240,7 @@
<field name="code">30</field>
<field name="name">Approvisionnements - matières premières</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_3"/>
<field name="type" >view</field>
</record>
@@ -249,7 +248,7 @@
<field name="code">31</field>
<field name="name">Approvisionnements et fournitures</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_3"/>
<field name="type" >view</field>
</record>
@@ -257,7 +256,7 @@
<field name="code">32</field>
<field name="name">En cours de fabrication</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_3"/>
<field name="type" >view</field>
</record>
@@ -265,7 +264,7 @@
<field name="code">33</field>
<field name="name">Produits finis</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_3"/>
<field name="type" >view</field>
</record>
@@ -273,7 +272,7 @@
<field name="code">34</field>
<field name="name">Marchandises</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_3"/>
<field name="type" >view</field>
</record>
@@ -281,7 +280,7 @@
<field name="code">36</field>
<field name="name">Acomptes versés sur achats pour stocks</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_3"/>
<field name="type" >view</field>
</record>
@@ -289,7 +288,7 @@
<field name="code">40</field>
<field name="name">Créances commerciales</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_4"/>
<field name="type" >view</field>
</record>
@@ -297,7 +296,7 @@
<field name="code">41</field>
<field name="name">Autres créances à - d'un an</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_4"/>
<field name="type" >view</field>
</record>
@@ -305,7 +304,7 @@
<field name="code">42</field>
<field name="name">Dettes à + d'1 an échéant dans l'année</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_4"/>
<field name="type" >view</field>
</record>
@@ -313,7 +312,7 @@
<field name="code">43</field>
<field name="name">Dettes financières</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_4"/>
<field name="type" >view</field>
</record>
@@ -321,7 +320,7 @@
<field name="code">44</field>
<field name="name">Dettes commerciales</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_4"/>
<field name="type" >view</field>
</record>
@@ -329,7 +328,7 @@
<field name="code">45</field>
<field name="name">Dettes fiscales, salariales et sociales</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_4"/>
<field name="type" >view</field>
</record>
@@ -337,7 +336,7 @@
<field name="code">47</field>
<field name="name">Dettes suite à l'affect. des résultats</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_4"/>
<field name="type" >view</field>
</record>
@@ -345,7 +344,7 @@
<field name="code">48</field>
<field name="name">Dettes diverses</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_4"/>
<field name="type" >view</field>
</record>
@@ -353,7 +352,7 @@
<field name="code">49</field>
<field name="name">Comptes de régularisation et cptes d'att</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_4"/>
<field name="type" >view</field>
</record>
@@ -361,7 +360,7 @@
<field name="code">51</field>
<field name="name">Actions et parts</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_5"/>
<field name="type" >view</field>
</record>
@@ -369,7 +368,7 @@
<field name="code">52</field>
<field name="name">Titres à revenu fixe</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_5"/>
<field name="type" >view</field>
</record>
@@ -377,7 +376,7 @@
<field name="code">53</field>
<field name="name">Dépôts à terme</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_5"/>
<field name="type" >view</field>
</record>
@@ -385,7 +384,7 @@
<field name="code">55</field>
<field name="name">Etablissements de crédit</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_5"/>
<field name="type" >view</field>
</record>
@@ -393,7 +392,7 @@
<field name="code">56</field>
<field name="name">Ccp</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_5"/>
<field name="type" >view</field>
</record>
@@ -401,7 +400,7 @@
<field name="code">57</field>
<field name="name">Caisses</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_5"/>
<field name="type" >view</field>
</record>
@@ -409,7 +408,7 @@
<field name="code">60</field>
<field name="name">Approvisionnements et marchandises</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_6"/>
<field name="type" >view</field>
</record>
@@ -417,7 +416,7 @@
<field name="code">61</field>
<field name="name">Services et biens divers</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_6"/>
<field name="type" >view</field>
</record>
@@ -425,7 +424,7 @@
<field name="code">62</field>
<field name="name">Rémunérations, charges soc. et pensions</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_6"/>
<field name="type" >view</field>
</record>
@@ -433,7 +432,7 @@
<field name="code">64</field>
<field name="name">Autres charges d'exploitation</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_6"/>
<field name="type" >view</field>
</record>
@@ -441,7 +440,7 @@
<field name="code">65</field>
<field name="name">Charges financières</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_6"/>
<field name="type" >view</field>
</record>
@@ -449,7 +448,7 @@
<field name="code">66</field>
<field name="name">Charges exceptionnelles</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_6"/>
<field name="type" >view</field>
</record>
@@ -457,7 +456,7 @@
<field name="code">67</field>
<field name="name">Impôts sur le résultat</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_6"/>
<field name="type" >view</field>
</record>
@@ -465,7 +464,7 @@
<field name="code">70</field>
<field name="name">Chiffre d'affaires</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_7"/>
<field name="type">view</field>
</record>
@@ -473,7 +472,7 @@
<field name="code">71</field>
<field name="name">Variation des stocks & comm. en cours</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_7"/>
<field name="type">view</field>
</record>
@@ -481,7 +480,7 @@
<field name="code">74</field>
<field name="name">Autres produits d'exploitation</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_7"/>
<field name="type">view</field>
</record>
@@ -489,7 +488,7 @@
<field name="code">75</field>
<field name="name">Produits financiers</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_7"/>
<field name="type">view</field>
</record>
@@ -497,7 +496,7 @@
<field name="code">77</field>
<field name="name">Régul. d'impôts & reprises prov. fisc.</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_7"/>
<field name="type">view</field>
</record>
@@ -505,7 +504,7 @@
<field name="code">140</field>
<field name="name">Bénéfice reporté</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_14"/>
<field name="type" >view</field>
</record>
@@ -513,7 +512,7 @@
<field name="code">175</field>
<field name="name">Dettes commerciales</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_17"/>
<field name="type" >view</field>
</record>
@@ -521,7 +520,7 @@
<field name="code">200</field>
<field name="name">Frais de constitution et d'augm. capital</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_20"/>
<field name="type" >view</field>
</record>
@@ -529,7 +528,7 @@
<field name="code">201</field>
<field name="name">Frais d'augmentation de capital</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_20"/>
<field name="type" >view</field>
</record>
@@ -537,7 +536,7 @@
<field name="code">202</field>
<field name="name">Fr.d'emission d'empr,prime remboursement</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_20"/>
<field name="type" >view</field>
</record>
@@ -545,7 +544,7 @@
<field name="code">203</field>
<field name="name">Autres frais d'établissement</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_20"/>
<field name="type" >view</field>
</record>
@@ -553,7 +552,7 @@
<field name="code">204</field>
<field name="name">Frais de restructuration</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_20"/>
<field name="type" >view</field>
</record>
@@ -561,7 +560,7 @@
<field name="code">210</field>
<field name="name">Frais de recherche et de développement</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_21"/>
<field name="type" >view</field>
</record>
@@ -569,7 +568,7 @@
<field name="code">211</field>
<field name="name">Concessions, brevets et licences</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_21"/>
<field name="type" >view</field>
</record>
@@ -577,7 +576,7 @@
<field name="code">212</field>
<field name="name">Fonds de commerce</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_21"/>
<field name="type" >view</field>
</record>
@@ -585,7 +584,7 @@
<field name="code">220</field>
<field name="name">Terrains</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_22"/>
<field name="type" >view</field>
</record>
@@ -593,7 +592,7 @@
<field name="code">221</field>
<field name="name">Constructions</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_22"/>
<field name="type" >view</field>
</record>
@@ -601,7 +600,7 @@
<field name="code">222</field>
<field name="name">Terrains bâtis</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_22"/>
<field name="type" >view</field>
</record>
@@ -609,7 +608,7 @@
<field name="code">223</field>
<field name="name">Autres droits réels sur des immeubles</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_22"/>
<field name="type" >view</field>
</record>
@@ -617,7 +616,7 @@
<field name="code">230</field>
<field name="name">Installations</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_23"/>
<field name="type" >view</field>
</record>
@@ -625,7 +624,7 @@
<field name="code">231</field>
<field name="name">Machines</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_23"/>
<field name="type" >view</field>
</record>
@@ -633,7 +632,7 @@
<field name="code">240</field>
<field name="name">Installation gen, agencements,..</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_24"/>
<field name="type" >view</field>
</record>
@@ -641,7 +640,7 @@
<field name="code">241</field>
<field name="name">Mobilier</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_24"/>
<field name="type" >view</field>
</record>
@@ -649,7 +648,7 @@
<field name="code">242</field>
<field name="name">Matériel roulant</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_24"/>
<field name="type" >view</field>
</record>
@@ -657,7 +656,7 @@
<field name="code">280</field>
<field name="name">Participation dans des entreprises liées</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_28"/>
<field name="type" >view</field>
</record>
@@ -665,7 +664,7 @@
<field name="code">281</field>
<field name="name">Créances sur des entreprises liées</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_28"/>
<field name="type" >view</field>
</record>
@@ -673,7 +672,7 @@
<field name="code">282</field>
<field name="name">Participations entr. avec lien particip.</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_28"/>
<field name="type" >view</field>
</record>
@@ -681,7 +680,7 @@
<field name="code">283</field>
<field name="name">Créances / entrepr. avec lien particip.</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_28"/>
<field name="type" >view</field>
</record>
@@ -689,7 +688,7 @@
<field name="code">290</field>
<field name="name">Créances commerciales</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_2"/>
<field name="type" >view</field>
</record>
@@ -697,7 +696,7 @@
<field name="code">291</field>
<field name="name">Autres créances</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_2"/>
<field name="type" >view</field>
</record>
@@ -705,7 +704,7 @@
<field name="code">411</field>
<field name="name">T.v.a en amont</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_41"/>
<field name="type" >view</field>
</record>
@@ -713,7 +712,7 @@
<field name="code">425</field>
<field name="name">Dettes commerciales échéant ds l'année</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_42"/>
<field name="type" >view</field>
</record>
@@ -721,7 +720,7 @@
<field name="code">451</field>
<field name="name">T.v.a. en aval</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_45"/>
<field name="type" >view</field>
</record>
@@ -729,7 +728,7 @@
<field name="code">452</field>
<field name="name">Impôts et taxes à payer</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_45"/>
<field name="type" >view</field>
</record>
@@ -737,7 +736,7 @@
<field name="code">512</field>
<field name="name">Actions & parts - options acquises</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_51"/>
<field name="type" >view</field>
</record>
@@ -745,7 +744,7 @@
<field name="code">550</field>
<field name="name">Comptes courants bancaires</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_55"/>
<field name="type" >view</field>
</record>
@@ -753,7 +752,7 @@
<field name="code">609</field>
<field name="name">Variation des stocks</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_60"/>
<field name="type" >view</field>
</record>
@@ -761,7 +760,7 @@
<field name="code">610</field>
<field name="name">Loyers et charges locatives</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_61"/>
<field name="type" >view</field>
</record>
@@ -769,7 +768,7 @@
<field name="code">612</field>
<field name="name">Fournitures faites à l'entreprise</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_61"/>
<field name="type" >view</field>
</record>
@@ -777,7 +776,7 @@
<field name="code">613</field>
<field name="name">Rétributions de tiers</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_61"/>
<field name="type" >view</field>
</record>
@@ -785,7 +784,7 @@
<field name="code">615</field>
<field name="name">publicités</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_61"/>
<field name="type" >view</field>
</record>
@@ -793,7 +792,7 @@
<field name="code">620</field>
<field name="name">Rémunérations et avantages soc. directs</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_62"/>
<field name="type" >view</field>
</record>
@@ -801,7 +800,7 @@
<field name="code">621</field>
<field name="name">Charges sociales</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_62"/>
<field name="type" >view</field>
</record>
@@ -809,14 +808,14 @@
<field name="code">624</field>
<field name="name">Pensions</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_62"/>
</record>
<record id="account_630" model="account.account.template">
<field name="code">630</field>
<field name="name">Dotations aux corrections de val./immob.</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_6"/>
<field name="type" >view</field>
</record>
@@ -824,7 +823,7 @@
<field name="code">631</field>
<field name="name">Dotations aux correct. de val./stocks</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_6"/>
<field name="type" >view</field>
</record>
@@ -832,7 +831,7 @@
<field name="code">632</field>
<field name="name">Dot. cor. val s/en-cours,pr fini</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_6"/>
<field name="type" >view</field>
</record>
@@ -840,7 +839,7 @@
<field name="code">633</field>
<field name="name">Dotations correct. val./cr. comm. +1an</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_6"/>
<field name="type" >view</field>
</record>
@@ -848,7 +847,7 @@
<field name="code">634</field>
<field name="name">Dotations correct. val./cr. comm. -1an</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_6"/>
<field name="type" >view</field>
</record>
@@ -856,7 +855,7 @@
<field name="code">635</field>
<field name="name">Provisions pour pensions et oblig. sim.</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_6"/>
<field name="type" >view</field>
</record>
@@ -864,7 +863,7 @@
<field name="code">636</field>
<field name="name">Provisions pour grosses réparations</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_6"/>
<field name="type" >view</field>
</record>
@@ -872,7 +871,7 @@
<field name="code">637</field>
<field name="name">Provisions pour autres risques & charges</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_6"/>
<field name="type" >view</field>
</record>
@@ -880,7 +879,7 @@
<field name="code">640</field>
<field name="name">Taxes et impôts directs</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_64"/>
<field name="type" >view</field>
</record>
@@ -888,7 +887,7 @@
<field name="code">651</field>
<field name="name">Réductions de valeur / actifs circulants</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_65"/>
<field name="type" >view</field>
</record>
@@ -896,7 +895,7 @@
<field name="code">660</field>
<field name="name">Dotations aux corrections de val. except</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_66"/>
<field name="type" >view</field>
</record>
@@ -904,7 +903,7 @@
<field name="code">661</field>
<field name="name">Dotations aux corrections de val./financ</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_66"/>
<field name="type" >view</field>
</record>
@@ -912,7 +911,7 @@
<field name="code">662</field>
<field name="name">Provisions pour risques & charges except</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_66"/>
<field name="type" >view</field>
</record>
@@ -920,7 +919,7 @@
<field name="code">750</field>
<field name="name">Produits des immob. financières</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_75"/>
<field name="type">view</field>
</record>
@@ -928,7 +927,7 @@
<field name="code">751</field>
<field name="name">Produits des actifs circulants</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_75"/>
<field name="type">view</field>
</record>
@@ -936,7 +935,7 @@
<field name="code">1750</field>
<field name="name">Fournisseurs - dettes en compte</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_175"/>
<field name="type">view</field>
</record>
@@ -944,7 +943,7 @@
<field name="code">1751</field>
<field name="name">Effets à payer</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_175"/>
<field name="type">view</field>
</record>
@@ -952,7 +951,7 @@
<field name="code">6120</field>
<field name="name">Eau, gaz, électricité, carburants</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_612"/>
<field name="type">view</field>
</record>
@@ -960,7 +959,7 @@
<field name="code">6123</field>
<field name="name">Téléphone, télégrammes, frais post.</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_612"/>
<field name="type">view</field>
</record>
@@ -968,7 +967,7 @@
<field name="code">100000</field>
<field name="name">Capital souscrit</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_10"/>
<field name="type">other</field>
</record>
@@ -976,7 +975,7 @@
<field name="code">101000</field>
<field name="name">Capital non appelé (-)</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_10"/>
<field name="type">other</field>
</record>
@@ -984,7 +983,7 @@
<field name="code">109000</field>
<field name="name">Compte de l'exploitant</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_10"/>
<field name="type">other</field>
</record>
@@ -992,7 +991,7 @@
<field name="code">110000</field>
<field name="name">Primes d'émission</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_1"/>
<field name="type">other</field>
</record>
@@ -1000,7 +999,7 @@
<field name="code">120000</field>
<field name="name">Plus-values de rééval. sur immob. incorp</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_12"/>
<field name="type">other</field>
</record>
@@ -1008,7 +1007,7 @@
<field name="code">121000</field>
<field name="name">Plus-values de rééval. sur immob. corp.</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_12"/>
<field name="type">other</field>
</record>
@@ -1016,7 +1015,7 @@
<field name="code">122000</field>
<field name="name">Plus-values de rééval. sur immob. fin.</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_12"/>
<field name="type">other</field>
</record>
@@ -1024,7 +1023,7 @@
<field name="code">123000</field>
<field name="name">Plus-values de réévaluation sur stocks</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_12"/>
<field name="type">other</field>
</record>
@@ -1032,7 +1031,7 @@
<field name="code">124000</field>
<field name="name">Reprises de réd. de val./plac. de très.</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_12"/>
<field name="type">other</field>
</record>
@@ -1040,7 +1039,7 @@
<field name="code">130000</field>
<field name="name">Réserve légale</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_13"/>
<field name="type">other</field>
</record>
@@ -1048,7 +1047,7 @@
<field name="code">131000</field>
<field name="name">Réserves indisponibles</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_13"/>
<field name="type">other</field>
</record>
@@ -1056,7 +1055,7 @@
<field name="code">132000</field>
<field name="name">Réserves immunisées</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_13"/>
<field name="type">other</field>
</record>
@@ -1064,7 +1063,7 @@
<field name="code">133000</field>
<field name="name">Réserves disponibles</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_13"/>
<field name="type">other</field>
</record>
@@ -1072,7 +1071,7 @@
<field name="code">134000</field>
<field name="name">Autres reserves</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_13"/>
<field name="type">other</field>
</record>
@@ -1080,7 +1079,7 @@
<field name="code">140000</field>
<field name="name">Résultats reportés</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_140"/>
<field name="type">other</field>
</record>
@@ -1088,7 +1087,7 @@
<field name="code">140100</field>
<field name="name">Bénéfice de l'exercice</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_140"/>
<field name="type">other</field>
</record>
@@ -1096,7 +1095,7 @@
<field name="code">140200</field>
<field name="name">Perte de l'exercice</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_140"/>
<field name="type">other</field>
</record>
@@ -1104,7 +1103,7 @@
<field name="code">141000</field>
<field name="name">Perte reportée</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_14"/>
<field name="type">other</field>
</record>
@@ -1112,7 +1111,7 @@
<field name="code">150000</field>
<field name="name">Subsides en cap. - montants obtenus</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_15"/>
<field name="type">other</field>
</record>
@@ -1120,7 +1119,7 @@
<field name="code">151000</field>
<field name="name">Subsides-montants transf. aux résultats</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_15"/>
<field name="type">other</field>
</record>
@@ -1128,7 +1127,7 @@
<field name="code">160000</field>
<field name="name">Provisions pour pensions</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_16"/>
<field name="type">other</field>
</record>
@@ -1136,7 +1135,7 @@
<field name="code">161000</field>
<field name="name">Provisions pour charges fiscales</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_16"/>
<field name="type">other</field>
</record>
@@ -1144,7 +1143,7 @@
<field name="code">162000</field>
<field name="name">Provisions pr grosses rép. & gros entr.</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_16"/>
<field name="type">other</field>
</record>
@@ -1152,7 +1151,7 @@
<field name="code">163000</field>
<field name="name">Provisions pour rente viagère</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_16"/>
<field name="type">other</field>
</record>
@@ -1160,7 +1159,7 @@
<field name="code">164000</field>
<field name="name">Provisions pr sûretés pers. et réelles</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_16"/>
<field name="type">other</field>
</record>
@@ -1168,7 +1167,7 @@
<field name="code">165000</field>
<field name="name">Provisions diverses</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_16"/>
<field name="type">other</field>
</record>
@@ -1176,7 +1175,7 @@
<field name="code">165400</field>
<field name="name">Provisions pour autres risques & charges</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_16"/>
<field name="type">other</field>
</record>
@@ -1184,7 +1183,7 @@
<field name="code">166000</field>
<field name="name">Provisions pour charges de commandes</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_16"/>
<field name="type">other</field>
</record>
@@ -1192,7 +1191,7 @@
<field name="code">168000</field>
<field name="name">Impôts différés</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_16"/>
<field name="type">other</field>
</record>
@@ -1200,7 +1199,7 @@
<field name="code">169000</field>
<field name="name">Autres provisions</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_16"/>
<field name="type">other</field>
</record>
@@ -1208,7 +1207,7 @@
<field name="code">170000</field>
<field name="name">Emprunts convertibles</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_17"/>
<field name="type">other</field>
</record>
@@ -1216,7 +1215,7 @@
<field name="code">171000</field>
<field name="name">Emprunts obligataires non convertibles</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_17"/>
<field name="type">other</field>
</record>
@@ -1224,7 +1223,7 @@
<field name="code">172000</field>
<field name="name">Dettes de loc. - financ. et assimilées</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_17"/>
<field name="type">other</field>
</record>
@@ -1232,7 +1231,7 @@
<field name="code">173000</field>
<field name="name">Etablissements de crédit</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_17"/>
<field name="type">other</field>
</record>
@@ -1240,7 +1239,7 @@
<field name="code">174000</field>
<field name="name">Autres emprunts</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_17"/>
<field name="type">other</field>
</record>
@@ -1248,7 +1247,7 @@
<field name="code">175000</field>
<field name="name">Fournisseurs - entreprises apparentées</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_1750"/>
<field name="type">other</field>
</record>
@@ -1256,7 +1255,7 @@
<field name="code">175010</field>
<field name="name">Dettes en cpte - fourniss. ordinaires</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_1750"/>
<field name="type">other</field>
</record>
@@ -1264,7 +1263,7 @@
<field name="code">175100</field>
<field name="name">Effets à payer - entreprises apparentées</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_1751"/>
<field name="type">other</field>
</record>
@@ -1272,7 +1271,7 @@
<field name="code">175110</field>
<field name="name">Effets à payer - fournisseurs ordinaires</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_1751"/>
<field name="type">other</field>
</record>
@@ -1280,7 +1279,7 @@
<field name="code">176000</field>
<field name="name">Acomptes reçus sur commandes</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_17"/>
<field name="type">other</field>
</record>
@@ -1288,7 +1287,7 @@
<field name="code">177100</field>
<field name="name">Entreprises liées</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_17"/>
<field name="type">other</field>
</record>
@@ -1296,7 +1295,7 @@
<field name="code">177200</field>
<field name="name">Lien de participation</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_17"/>
<field name="type">other</field>
</record>
@@ -1304,7 +1303,7 @@
<field name="code">178000</field>
<field name="name">Cautionnements reçus en numéraire</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_17"/>
<field name="type">other</field>
</record>
@@ -1312,7 +1311,7 @@
<field name="code">179000</field>
<field name="name">Dettes diverses</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_17"/>
<field name="type">other</field>
</record>
@@ -1320,7 +1319,7 @@
<field name="code">180000</field>
<field name="name">Comptes de liaison établiss. & succurs.</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_1"/>
<field name="type">other</field>
</record>
@@ -1328,7 +1327,7 @@
<field name="code">200000</field>
<field name="name">Frais de constitution</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_200"/>
<field name="type">other</field>
</record>
@@ -1336,7 +1335,7 @@
<field name="code">200900</field>
<field name="name">Amort s/fr de constitution</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_200"/>
<field name="type">other</field>
</record>
@@ -1344,7 +1343,7 @@
<field name="code">201000</field>
<field name="name">Frais d'augmentation de capital</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_201"/>
<field name="type">other</field>
</record>
@@ -1352,7 +1351,7 @@
<field name="code">201900</field>
<field name="name">Amort s/fr d'augmentation du capital</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_201"/>
<field name="type">other</field>
</record>
@@ -1360,7 +1359,7 @@
<field name="code">202000</field>
<field name="name">Fr.d'emission d'empr,prime remboursement</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_202"/>
<field name="type">other</field>
</record>
@@ -1368,7 +1367,7 @@
<field name="code">202900</field>
<field name="name">Amort s/fr d'émission d'emprunts</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_202"/>
<field name="type">other</field>
</record>
@@ -1376,7 +1375,7 @@
<field name="code">203000</field>
<field name="name">Autres frais d'établissement</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_203"/>
<field name="type">other</field>
</record>
@@ -1384,7 +1383,7 @@
<field name="code">203900</field>
<field name="name">Amort s/autres fr d'établissement</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_203"/>
<field name="type">other</field>
</record>
@@ -1392,7 +1391,7 @@
<field name="code">204000</field>
<field name="name">Frais de restructuration</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_204"/>
<field name="type">other</field>
</record>
@@ -1400,7 +1399,7 @@
<field name="code">204900</field>
<field name="name">Amort s/fr de restructuration</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_204"/>
<field name="type">other</field>
</record>
@@ -1408,7 +1407,7 @@
<field name="code">210000</field>
<field name="name">Frais de recherche et développement</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_210"/>
<field name="type">other</field>
</record>
@@ -1416,7 +1415,7 @@
<field name="code">210900</field>
<field name="name">Amort. s/fr de recherche et développemen</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_210"/>
<field name="type">other</field>
</record>
@@ -1424,7 +1423,7 @@
<field name="code">211100</field>
<field name="name">Concessions, brevet à titre onéreux</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_211"/>
<field name="type">other</field>
</record>
@@ -1432,7 +1431,7 @@
<field name="code">211190</field>
<field name="name">Amort. s/concession, brevet acquis</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_211"/>
<field name="type">other</field>
</record>
@@ -1440,7 +1439,7 @@
<field name="code">211200</field>
<field name="name">Conc., brevets créés par l'entr. même</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_211"/>
<field name="type">other</field>
</record>
@@ -1448,7 +1447,7 @@
<field name="code">211290</field>
<field name="name">Amort. s/concession, brevets créés</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_211"/>
<field name="type">other</field>
</record>
@@ -1456,7 +1455,7 @@
<field name="code">212000</field>
<field name="name">Fonds de commerce</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_212"/>
<field name="type">other</field>
</record>
@@ -1464,7 +1463,7 @@
<field name="code">212900</field>
<field name="name">Amort s/fonds de commerce</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_212"/>
<field name="type">other</field>
</record>
@@ -1472,7 +1471,7 @@
<field name="code">213000</field>
<field name="name">Acomptes versés s/immob. incorp</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_21"/>
<field name="type">other</field>
</record>
@@ -1480,7 +1479,7 @@
<field name="code">214000</field>
<field name="name">Surprix afférent à l'acquisit. d'1 part.</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_21"/>
<field name="type">other</field>
</record>
@@ -1488,7 +1487,7 @@
<field name="code">220000</field>
<field name="name">Terrains</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_220"/>
<field name="type">other</field>
</record>
@@ -1496,7 +1495,7 @@
<field name="code">220800</field>
<field name="name">Plus-values actées sur terrains</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_220"/>
<field name="type">other</field>
</record>
@@ -1504,7 +1503,7 @@
<field name="code">220900</field>
<field name="name">Réduction de valeur sur terrains</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_220"/>
<field name="type">other</field>
</record>
@@ -1512,7 +1511,7 @@
<field name="code">221800</field>
<field name="name">Plus-values actées sur constructions</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_221"/>
<field name="type">other</field>
</record>
@@ -1520,7 +1519,7 @@
<field name="code">221900</field>
<field name="name">Amort. sur constructions</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_221"/>
<field name="type">other</field>
</record>
@@ -1528,7 +1527,7 @@
<field name="code">222800</field>
<field name="name">Plus-values actées s/terrains bâtis</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_222"/>
<field name="type">other</field>
</record>
@@ -1536,7 +1535,7 @@
<field name="code">222900</field>
<field name="name">Amort. sur terrains bâtis</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_222"/>
<field name="type">other</field>
</record>
@@ -1544,7 +1543,7 @@
<field name="code">223800</field>
<field name="name">+values actées s/autres droits</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_223"/>
<field name="type">other</field>
</record>
@@ -1552,7 +1551,7 @@
<field name="code">223900</field>
<field name="name">Amort s/autres droits réels</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_223"/>
<field name="type">other</field>
</record>
@@ -1560,7 +1559,7 @@
<field name="code">230000</field>
<field name="name">Installations techniques</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_230"/>
<field name="type">other</field>
</record>
@@ -1568,7 +1567,7 @@
<field name="code">230900</field>
<field name="name">Amort s/installations techniques</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_230"/>
<field name="type">other</field>
</record>
@@ -1576,7 +1575,7 @@
<field name="code">231000</field>
<field name="name">Machines</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_231"/>
<field name="type">other</field>
</record>
@@ -1584,7 +1583,7 @@
<field name="code">231900</field>
<field name="name">Amortissement s/machines</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_231"/>
<field name="type">other</field>
</record>
@@ -1592,7 +1591,7 @@
<field name="code">232000</field>
<field name="name">Outillage</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_23"/>
<field name="type">other</field>
</record>
@@ -1600,7 +1599,7 @@
<field name="code">233000</field>
<field name="name">Pièces de rechange</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_23"/>
<field name="type">other</field>
</record>
@@ -1608,7 +1607,7 @@
<field name="code">238000</field>
<field name="name">Plus-values actées sur i./m./o.</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_23"/>
<field name="type">other</field>
</record>
@@ -1616,7 +1615,7 @@
<field name="code">239000</field>
<field name="name">Amortissements sur i./m./o.</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_23"/>
<field name="type">other</field>
</record>
@@ -1624,7 +1623,7 @@
<field name="code">240000</field>
<field name="name">Installation gen, agencements,..</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_240"/>
<field name="type">other</field>
</record>
@@ -1632,7 +1631,7 @@
<field name="code">240900</field>
<field name="name">Amort s/autres installations,outillage</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_240"/>
<field name="type">other</field>
</record>
@@ -1640,7 +1639,7 @@
<field name="code">241000</field>
<field name="name">Mobilier</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_241"/>
<field name="type">other</field>
</record>
@@ -1648,7 +1647,7 @@
<field name="code">241900</field>
<field name="name">Amort. sur mobilier</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_241"/>
<field name="type">other</field>
</record>
@@ -1656,7 +1655,7 @@
<field name="code">242000</field>
<field name="name">Matériel roulant</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_242"/>
<field name="type">other</field>
</record>
@@ -1664,7 +1663,7 @@
<field name="code">242900</field>
<field name="name">Amort. s/matériel roulant</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_242"/>
<field name="type">other</field>
</record>
@@ -1672,7 +1671,7 @@
<field name="code">243000</field>
<field name="name">Matériel de bureau</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_24"/>
<field name="type">other</field>
</record>
@@ -1680,7 +1679,7 @@
<field name="code">243900</field>
<field name="name">Amort. s/matériel de bureau</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_24"/>
<field name="type">other</field>
</record>
@@ -1688,7 +1687,7 @@
<field name="code">250000</field>
<field name="name">Terrains et constructions en loc.-fin.</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_25"/>
<field name="type">other</field>
</record>
@@ -1696,7 +1695,7 @@
<field name="code">251000</field>
<field name="name">Install., machines & out. en loc.-fin.</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_25"/>
<field name="type">other</field>
</record>
@@ -1704,7 +1703,7 @@
<field name="code">252000</field>
<field name="name">Mobilier et mat. roulant en loc.-fin.</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_25"/>
<field name="type">other</field>
</record>
@@ -1712,7 +1711,7 @@
<field name="code">260000</field>
<field name="name">Autres immobilisations corporelles</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_2"/>
<field name="type">other</field>
</record>
@@ -1720,7 +1719,7 @@
<field name="code">270000</field>
<field name="name">Immobilisations en cours</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_27"/>
<field name="type">other</field>
</record>
@@ -1728,7 +1727,7 @@
<field name="code">271000</field>
<field name="name">Avances & acptes versés / immob.en cours</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_27"/>
<field name="type">other</field>
</record>
@@ -1736,7 +1735,7 @@
<field name="code">280000</field>
<field name="name">Parts dans des entreprises liées</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_280"/>
<field name="type">other</field>
</record>
@@ -1744,7 +1743,7 @@
<field name="code">280100</field>
<field name="name">Montants non appelés</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_280"/>
<field name="type">other</field>
</record>
@@ -1752,7 +1751,7 @@
<field name="code">280800</field>
<field name="name">+values actées s/parts entreprises liées</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_280"/>
<field name="type">other</field>
</record>
@@ -1760,7 +1759,7 @@
<field name="code">280900</field>
<field name="name">Réduction de valeur s/parts</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_280"/>
<field name="type">other</field>
</record>
@@ -1768,7 +1767,7 @@
<field name="code">281000</field>
<field name="name">Créances s/des entreprises liées</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_281"/>
<field name="type">other</field>
</record>
@@ -1776,7 +1775,7 @@
<field name="code">281100</field>
<field name="name">Effets à recevoir</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_281"/>
<field name="type">other</field>
</record>
@@ -1784,7 +1783,7 @@
<field name="code">281700</field>
<field name="name">Créances douteuses (entreprises liées)</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_281"/>
<field name="type">other</field>
</record>
@@ -1792,7 +1791,7 @@
<field name="code">281900</field>
<field name="name">Réduction de valeur s/cré. entre. liées</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_281"/>
<field name="type">other</field>
</record>
@@ -1800,7 +1799,7 @@
<field name="code">282000</field>
<field name="name">Participations</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_282"/>
<field name="type">other</field>
</record>
@@ -1808,7 +1807,7 @@
<field name="code">282100</field>
<field name="name">Montants non appelés</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_282"/>
<field name="type">other</field>
</record>
@@ -1816,7 +1815,7 @@
<field name="code">282800</field>
<field name="name">+values actées s/participations</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_282"/>
<field name="type">other</field>
</record>
@@ -1824,7 +1823,7 @@
<field name="code">282900</field>
<field name="name">Réduction de valeur s/participations</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_282"/>
<field name="type">other</field>
</record>
@@ -1832,7 +1831,7 @@
<field name="code">283000</field>
<field name="name">Créances s/entrepr. lien de particip.</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_283"/>
<field name="type">other</field>
</record>
@@ -1840,7 +1839,7 @@
<field name="code">283100</field>
<field name="name">Effets à recevoir</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_283"/>
<field name="type">other</field>
</record>
@@ -1848,7 +1847,7 @@
<field name="code">283200</field>
<field name="name">Titres à revenu fixe</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_283"/>
<field name="type">other</field>
</record>
@@ -1856,7 +1855,7 @@
<field name="code">283700</field>
<field name="name">Créances douteuses (s/participations)</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_283"/>
<field name="type">other</field>
</record>
@@ -1864,7 +1863,7 @@
<field name="code">283900</field>
<field name="name">Réductions de valeur s/cr particip.</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_283"/>
<field name="type">other</field>
</record>
@@ -1872,7 +1871,7 @@
<field name="code">284000</field>
<field name="name">Titres à caractère d'immobilisation</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_28"/>
<field name="type">other</field>
</record>
@@ -1880,7 +1879,7 @@
<field name="code">285000</field>
<field name="name">Autres prêts</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_28"/>
<field name="type">other</field>
</record>
@@ -1888,7 +1887,7 @@
<field name="code">286000</field>
<field name="name">Actions ou parts propres</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_28"/>
<field name="type">other</field>
</record>
@@ -1896,7 +1895,7 @@
<field name="code">288000</field>
<field name="name">Cautionnements versés en numéraire</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_28"/>
<field name="type">other</field>
</record>
@@ -1904,7 +1903,7 @@
<field name="code">290000</field>
<field name="name">Créances commerciales</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_290"/>
<field name="type">other</field>
</record>
@@ -1912,7 +1911,7 @@
<field name="code">290100</field>
<field name="name">Effets à recevoir</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_290"/>
<field name="type">other</field>
</record>
@@ -1920,7 +1919,7 @@
<field name="code">290600</field>
<field name="name">Acomptes versés</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_290"/>
<field name="type">other</field>
</record>
@@ -1928,7 +1927,7 @@
<field name="code">290700</field>
<field name="name">Créances douteuses s/cr commerciales</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_290"/>
<field name="type">other</field>
</record>
@@ -1936,7 +1935,7 @@
<field name="code">290900</field>
<field name="name">Réduction de valeur s/cr commerciales</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_290"/>
<field name="type">other</field>
</record>
@@ -1944,7 +1943,7 @@
<field name="code">291000</field>
<field name="name">Autres créances</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_291"/>
<field name="type">other</field>
</record>
@@ -1952,7 +1951,7 @@
<field name="code">291100</field>
<field name="name">Effets à recevoir</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_291"/>
<field name="type">other</field>
</record>
@@ -1960,7 +1959,7 @@
<field name="code">291700</field>
<field name="name">Créances douteuses s/autres créances</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_291"/>
<field name="type">other</field>
</record>
@@ -1968,7 +1967,7 @@
<field name="code">291900</field>
<field name="name">Réduction de valeur s/autres créances</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_291"/>
<field name="type">other</field>
</record>
@@ -1976,7 +1975,7 @@
<field name="code">300000</field>
<field name="name">Stocks matières premières val. d'acquis.</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_30"/>
<field name="type">other</field>
</record>
@@ -1984,7 +1983,7 @@
<field name="code">309000</field>
<field name="name">Réduction de valeur s/mat. premières</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_30"/>
<field name="type">other</field>
</record>
@@ -1992,7 +1991,7 @@
<field name="code">310000</field>
<field name="name">Matières consommables</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_31"/>
<field name="type">other</field>
</record>
@@ -2000,7 +1999,7 @@
<field name="code">310600</field>
<field name="name">Emballages commerciaux</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_31"/>
<field name="type">other</field>
</record>
@@ -2008,7 +2007,7 @@
<field name="code">319000</field>
<field name="name">Réd. de val. - stocks fournitures (-)</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_31"/>
<field name="type">other</field>
</record>
@@ -2016,7 +2015,7 @@
<field name="code">320000</field>
<field name="name">En cours de fabrication - val. d'acquis.</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_32"/>
<field name="type">other</field>
</record>
@@ -2024,7 +2023,7 @@
<field name="code">329000</field>
<field name="name">Réductions de valeur / en cours (-)</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_32"/>
<field name="type">other</field>
</record>
@@ -2032,7 +2031,7 @@
<field name="code">330000</field>
<field name="name">Valeur d'acquisition des produits finis</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_33"/>
<field name="type">other</field>
</record>
@@ -2040,7 +2039,7 @@
<field name="code">339000</field>
<field name="name">Réduction de val. / produits finis (-)</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_33"/>
<field name="type">other</field>
</record>
@@ -2048,7 +2047,7 @@
<field name="code">340000</field>
<field name="name">Stocks marchandises - valeur d'acquis.</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_34"/>
<field name="type">other</field>
</record>
@@ -2056,7 +2055,7 @@
<field name="code">349000</field>
<field name="name">Réd. de val. / stocks marchandises (-)</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_34"/>
<field name="type">other</field>
</record>
@@ -2064,7 +2063,7 @@
<field name="code">360000</field>
<field name="name">Acomptes versés / achats pour stocks</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_36"/>
<field name="type">other</field>
</record>
@@ -2072,7 +2071,7 @@
<field name="code">369000</field>
<field name="name">Réd. de val. / acptes versés stocks (-)</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_36"/>
<field name="type">other</field>
</record>
@@ -2080,7 +2079,7 @@
<field name="code">400000</field>
<field name="name">Clients</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_40"/>
<field name="type">other</field>
</record>
@@ -2092,13 +2091,13 @@
<field name="parent_id" ref="account_40"/>
<field name="type">receivable</field>
-
+
</record>
<record id="account_403000" model="account.account.template">
<field name="code">403000</field>
<field name="name">Créances s/entreprises apparentées</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_40"/>
<field name="type">receivable</field>
</record>
@@ -2106,7 +2105,7 @@
<field name="code">404000</field>
<field name="name">Produits à recevoir (factures à établir)</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_40"/>
<field name="type">other</field>
</record>
@@ -2114,7 +2113,7 @@
<field name="code">406000</field>
<field name="name">Acomptes versés aux fournisseurs</field>
<field name="user_type" ref="account_type_creances"/>
-
+
<field name="parent_id" ref="account_40"/>
<field name="type">payable</field>
</record>
@@ -2122,7 +2121,7 @@
<field name="code">407000</field>
<field name="name">Créances commerciales douteuses</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_40"/>
<field name="type">other</field>
</record>
@@ -2130,7 +2129,7 @@
<field name="code">408000</field>
<field name="name">Ecarts de conversion de devises/créances</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_40"/>
<field name="type">other</field>
</record>
@@ -2138,7 +2137,7 @@
<field name="code">409000</field>
<field name="name">Réductions de valeur / créances comm.</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_40"/>
<field name="type">other</field>
</record>
@@ -2146,7 +2145,7 @@
<field name="code">410000</field>
<field name="name">Capital appelé, non versé</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_41"/>
<field name="type">other</field>
</record>
@@ -2162,7 +2161,7 @@
<field name="code">411100</field>
<field name="name">T.v.a soumise à l'origine amont</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_411"/>
<field name="type">other</field>
</record>
@@ -2170,7 +2169,7 @@
<field name="code">411500</field>
<field name="name">Compte courant tva</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_411"/>
<field name="type">other</field>
</record>
@@ -2178,7 +2177,7 @@
<field name="code">412000</field>
<field name="name">Impots et vers. fiscaux à récupérer</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_41"/>
<field name="type">other</field>
</record>
@@ -2186,7 +2185,7 @@
<field name="code">413100</field>
<field name="name">Autres créances sur entrepr. liées</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_41"/>
<field name="type">other</field>
</record>
@@ -2194,7 +2193,7 @@
<field name="code">413200</field>
<field name="name">Autres créances / entrepr. apparentées</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_41"/>
<field name="type">other</field>
</record>
@@ -2202,7 +2201,7 @@
<field name="code">414000</field>
<field name="name">Produits à recevoir (non commerciaux)</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_41"/>
<field name="type">other</field>
</record>
@@ -2210,7 +2209,7 @@
<field name="code">416000</field>
<field name="name">Créances diverses</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_41"/>
<field name="type">other</field>
</record>
@@ -2218,7 +2217,7 @@
<field name="code">417000</field>
<field name="name">Créances douteuses</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_41"/>
<field name="type">other</field>
</record>
@@ -2226,7 +2225,7 @@
<field name="code">418000</field>
<field name="name">Cautionnements versés en numéraire</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_41"/>
<field name="type">other</field>
</record>
@@ -2234,7 +2233,7 @@
<field name="code">419000</field>
<field name="name">Réductions de val. / autres créances (-)</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_41"/>
<field name="type">other</field>
</record>
@@ -2242,7 +2241,7 @@
<field name="code">420000</field>
<field name="name">Emprunts obligataires convert.</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_42"/>
<field name="type">other</field>
</record>
@@ -2250,7 +2249,7 @@
<field name="code">421000</field>
<field name="name">Emprunts oblig. non convertibles</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_42"/>
<field name="type">other</field>
</record>
@@ -2258,7 +2257,7 @@
<field name="code">422000</field>
<field name="name">Dettes de location-financ. et assimilées</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_42"/>
<field name="type">other</field>
</record>
@@ -2266,7 +2265,7 @@
<field name="code">423000</field>
<field name="name">Etablissements de crédit</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_42"/>
<field name="type">other</field>
</record>
@@ -2274,7 +2273,7 @@
<field name="code">424000</field>
<field name="name">Autres emprunts</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_42"/>
<field name="type">other</field>
</record>
@@ -2282,7 +2281,7 @@
<field name="code">425000</field>
<field name="name">Fournisseurs</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_425"/>
<field name="type">other</field>
</record>
@@ -2290,7 +2289,7 @@
<field name="code">425100</field>
<field name="name">Effets à payer</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_425"/>
<field name="type">other</field>
</record>
@@ -2298,7 +2297,7 @@
<field name="code">426000</field>
<field name="name">Acomptes reçus / commandes éch. ds l'an</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_42"/>
<field name="type">other</field>
</record>
@@ -2306,7 +2305,7 @@
<field name="code">427100</field>
<field name="name">Entreprises liées</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_42"/>
<field name="type">other</field>
</record>
@@ -2314,7 +2313,7 @@
<field name="code">427200</field>
<field name="name">Lien de participation</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_42"/>
<field name="type">other</field>
</record>
@@ -2322,7 +2321,7 @@
<field name="code">428000</field>
<field name="name">Cautionnements reçus en numéraire</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_42"/>
<field name="type">other</field>
</record>
@@ -2330,7 +2329,7 @@
<field name="code">429000</field>
<field name="name">Dettes diverses échéant dans l'année</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_42"/>
<field name="type">other</field>
</record>
@@ -2338,7 +2337,7 @@
<field name="code">430000</field>
<field name="name">Banques-emprunts en compte à terme fixe</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_43"/>
<field name="type">other</field>
</record>
@@ -2346,7 +2345,7 @@
<field name="code">431000</field>
<field name="name">Banques-promesses</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_43"/>
<field name="type">other</field>
</record>
@@ -2354,7 +2353,7 @@
<field name="code">432000</field>
<field name="name">Banques-crédit d'acceptation</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_43"/>
<field name="type">other</field>
</record>
@@ -2362,7 +2361,7 @@
<field name="code">433000</field>
<field name="name">Banques-dettes en compte courant</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_43"/>
<field name="type">other</field>
</record>
@@ -2370,7 +2369,7 @@
<field name="code">438000</field>
<field name="name">Autres emprunts</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_43"/>
<field name="type">other</field>
</record>
@@ -2378,7 +2377,7 @@
<field name="code">440000</field>
<field name="name">Fournisseurs</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_44"/>
<field name="type">other</field>
</record>
@@ -2404,7 +2403,7 @@
<field name="code">443100</field>
<field name="name">Entreprises liées</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_44"/>
<field name="type">other</field>
</record>
@@ -2412,7 +2411,7 @@
<field name="code">443200</field>
<field name="name">Lien de participation</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_44"/>
<field name="type">other</field>
</record>
@@ -2420,7 +2419,7 @@
<field name="code">450000</field>
<field name="name">Dettes fiscales estimées</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_45"/>
<field name="type">other</field>
</record>
@@ -2455,7 +2454,7 @@
<field name="code">451500</field>
<field name="name">Compte courant tva</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_451"/>
<field name="type">other</field>
</record>
@@ -2463,7 +2462,7 @@
<field name="code">452000</field>
<field name="name">Impôts et taxes à payer à l'état</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_452"/>
<field name="type">other</field>
</record>
@@ -2471,7 +2470,7 @@
<field name="code">452100</field>
<field name="name">Impôts et taxes à payer aux adm commun</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_452"/>
<field name="type">other</field>
</record>
@@ -2479,7 +2478,7 @@
<field name="code">453000</field>
<field name="name">Retenues s/salaires</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_45"/>
<field name="type">other</field>
</record>
@@ -2487,7 +2486,7 @@
<field name="code">454000</field>
<field name="name">Cass (centre..de sécurite soc)</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_45"/>
<field name="type">other</field>
</record>
@@ -2495,7 +2494,7 @@
<field name="code">455000</field>
<field name="name">Personnel-rémuneration à payer</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_45"/>
<field name="type">other</field>
</record>
@@ -2503,7 +2502,7 @@
<field name="code">456000</field>
<field name="name">Personnel-avances et acomptes</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_45"/>
<field name="type">other</field>
</record>
@@ -2511,7 +2510,7 @@
<field name="code">458000</field>
<field name="name">Autres dettes sociales</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_45"/>
<field name="type">other</field>
</record>
@@ -2519,7 +2518,7 @@
<field name="code">460000</field>
<field name="name">Acomptes reçus sur commandes</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_4"/>
<field name="type">other</field>
</record>
@@ -2527,7 +2526,7 @@
<field name="code">470000</field>
<field name="name">Dividendes-tantièmes d'ex. ant. à payer</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_47"/>
<field name="type">other</field>
</record>
@@ -2535,7 +2534,7 @@
<field name="code">471000</field>
<field name="name">Dividendes de l'exercice à payer</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_47"/>
<field name="type">other</field>
</record>
@@ -2543,7 +2542,7 @@
<field name="code">472000</field>
<field name="name">Tantièmes de l'exercice à payer</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_47"/>
<field name="type">other</field>
</record>
@@ -2551,7 +2550,7 @@
<field name="code">473000</field>
<field name="name">Autres allocataires à payer</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_47"/>
<field name="type">other</field>
</record>
@@ -2559,7 +2558,7 @@
<field name="code">480000</field>
<field name="name">Obligations et coupons échus (dettes)</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_48"/>
<field name="type">other</field>
</record>
@@ -2567,7 +2566,7 @@
<field name="code">487000</field>
<field name="name">Cautionnements reçus en numeraire</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_48"/>
<field name="type">other</field>
</record>
@@ -2575,7 +2574,7 @@
<field name="code">488000</field>
<field name="name">Autres dettes diverses</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_48"/>
<field name="type">other</field>
</record>
@@ -2583,7 +2582,7 @@
<field name="code">490000</field>
<field name="name">Charges à reporter (payées d'avance)</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_49"/>
<field name="type">other</field>
</record>
@@ -2591,7 +2590,7 @@
<field name="code">491000</field>
<field name="name">Produits acquis</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_49"/>
<field name="type">other</field>
</record>
@@ -2599,7 +2598,7 @@
<field name="code">492000</field>
<field name="name">Charges à imputer</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_49"/>
<field name="type">other</field>
</record>
@@ -2607,7 +2606,7 @@
<field name="code">493000</field>
<field name="name">Produits à reporter</field>
<field name="user_type" ref="account_type_liability"/>
-
+
<field name="parent_id" ref="account_49"/>
<field name="type">other</field>
</record>
@@ -2615,7 +2614,7 @@
<field name="code">499000</field>
<field name="name">Comptes d'attente</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_49"/>
<field name="type">other</field>
</record>
@@ -2623,7 +2622,7 @@
<field name="code">499800</field>
<field name="name">Solde équilibre en devises (hors pc)</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_49"/>
<field name="type">other</field>
</record>
@@ -2631,7 +2630,7 @@
<field name="code">500000</field>
<field name="name">Actions propres</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_5"/>
<field name="type">other</field>
</record>
@@ -2639,7 +2638,7 @@
<field name="code">510000</field>
<field name="name">Actions et parts</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_51"/>
<field name="type">other</field>
</record>
@@ -2647,7 +2646,7 @@
<field name="code">510100</field>
<field name="name">Montant non appelé s/action.part</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_51"/>
<field name="type">other</field>
</record>
@@ -2655,7 +2654,7 @@
<field name="code">510900</field>
<field name="name">Réduction valeur s/action et parts</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_51"/>
<field name="type">other</field>
</record>
@@ -2663,7 +2662,7 @@
<field name="code">512000</field>
<field name="name">Parts dans entreprises liées</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_512"/>
<field name="type">other</field>
</record>
@@ -2671,7 +2670,7 @@
<field name="code">512100</field>
<field name="name">Montant non appelé s/parts</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_512"/>
<field name="type">other</field>
</record>
@@ -2679,7 +2678,7 @@
<field name="code">512900</field>
<field name="name">Réduction valeur s/part ent. liées</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_512"/>
<field name="type">other</field>
</record>
@@ -2687,7 +2686,7 @@
<field name="code">520000</field>
<field name="name">Titres à rev. fixes - valeur d'acquis.</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_52"/>
<field name="type">other</field>
</record>
@@ -2695,7 +2694,7 @@
<field name="code">529000</field>
<field name="name">Titres à rev. fixes - réd. de val.</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_52"/>
<field name="type">other</field>
</record>
@@ -2703,7 +2702,7 @@
<field name="code">530000</field>
<field name="name">Dépôts à terme</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_53"/>
<field name="type">other</field>
</record>
@@ -2711,7 +2710,7 @@
<field name="code">539000</field>
<field name="name">Réductions de valeur / dépôts à terme</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_53"/>
<field name="type">other</field>
</record>
@@ -2719,7 +2718,7 @@
<field name="code">540000</field>
<field name="name">Valeurs échues à l'encaissement</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_5"/>
<field name="type">other</field>
</record>
@@ -2727,7 +2726,7 @@
<field name="code">541000</field>
<field name="name">Coupons à encaisser</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_5"/>
<field name="type">other</field>
</record>
@@ -2735,7 +2734,7 @@
<field name="code">550000</field>
<field name="name">Ets de crédit-compte à vue</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_550"/>
<field name="type">other</field>
</record>
@@ -2743,7 +2742,7 @@
<field name="code">550100</field>
<field name="name">Chèques et virements émis</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_550"/>
<field name="type">other</field>
</record>
@@ -2751,7 +2750,7 @@
<field name="code">550900</field>
<field name="name">Réduction valeur s/cpte a vue</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_550"/>
<field name="type">other</field>
</record>
@@ -2759,7 +2758,7 @@
<field name="code">560000</field>
<field name="name">Ccp - compte courant</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_56"/>
<field name="type">other</field>
</record>
@@ -2767,7 +2766,7 @@
<field name="code">561000</field>
<field name="name">Ccp - chèques émis</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_56"/>
<field name="type">other</field>
</record>
@@ -2775,7 +2774,7 @@
<field name="code">570000</field>
<field name="name">Caisses</field>
<field name="user_type" ref="account_type_asset"/>
-
+
<field name="parent_id" ref="account_57"/>
<field name="type">other</field>
</record>
@@ -2783,7 +2782,7 @@
<field name="code">570900</field>
<field name="name">Réduction valeur s/caisse</field>
<field name="user_type" ref="account_type_root"/>
-
+
<field name="parent_id" ref="account_57"/>
<field name="type">other</field>
</record>
@@ -2800,7 +2799,7 @@
<field name="code">600000</field>
<field name="name">Achats de matières premières</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_60"/>
<field name="type">other</field>
</record>
@@ -2808,7 +2807,7 @@
<field name="code">601000</field>
<field name="name">Achats de fournitures</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_60"/>
<field name="type">other</field>
</record>
@@ -2816,7 +2815,7 @@
<field name="code">602000</field>
<field name="name">Achats de services, travaux et études</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_60"/>
<field name="type">other</field>
</record>
@@ -2824,7 +2823,7 @@
<field name="code">603000</field>
<field name="name">Achats de sous-traitances générales</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_60"/>
<field name="type">other</field>
</record>
@@ -2832,7 +2831,7 @@
<field name="code">604000</field>
<field name="name">Achats de marchandises</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_60"/>
<field name="type">other</field>
</record>
@@ -2840,7 +2839,7 @@
<field name="code">607000</field>
<field name="name">Achats produits et demi-produits</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_60"/>
<field name="type">other</field>
</record>
@@ -2848,7 +2847,7 @@
<field name="code">608000</field>
<field name="name">Remises, ristournes et rabais sur achats</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_60"/>
<field name="type">other</field>
</record>
@@ -2856,7 +2855,7 @@
<field name="code">609000</field>
<field name="name">Variation de stock mat. premières</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_609"/>
<field name="type">other</field>
</record>
@@ -2864,7 +2863,7 @@
<field name="code">609100</field>
<field name="name">Variation stock mat. consommables</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_609"/>
<field name="type">other</field>
</record>
@@ -2872,7 +2871,7 @@
<field name="code">609400</field>
<field name="name">Variation stock marchandises</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_609"/>
<field name="type">other</field>
</record>
@@ -2880,7 +2879,7 @@
<field name="code">610000</field>
<field name="name">Loyers et charges locatives</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_610"/>
<field name="type">other</field>
</record>
@@ -2888,7 +2887,7 @@
<field name="code">610100</field>
<field name="name">Redevances de crédit bail</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_610"/>
<field name="type">other</field>
</record>
@@ -2896,7 +2895,7 @@
<field name="code">611000</field>
<field name="name">Entretiens et réparations des locaux</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_61"/>
<field name="type">other</field>
</record>
@@ -2904,7 +2903,7 @@
<field name="code">612000</field>
<field name="name">Consommation - eau</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_6120"/>
<field name="type">other</field>
</record>
@@ -2912,7 +2911,7 @@
<field name="code">612010</field>
<field name="name">Consommation - gaz</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_6120"/>
<field name="type">other</field>
</record>
@@ -2920,7 +2919,7 @@
<field name="code">612020</field>
<field name="name">Consommation - électricité</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_6120"/>
<field name="type">other</field>
</record>
@@ -2928,7 +2927,7 @@
<field name="code">612030</field>
<field name="name">Consommation - carburants</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_6120"/>
<field name="type">other</field>
</record>
@@ -2936,7 +2935,7 @@
<field name="code">612040</field>
<field name="name">Consommation - mazout</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_6120"/>
<field name="type">other</field>
</record>
@@ -2944,7 +2943,7 @@
<field name="code">612100</field>
<field name="name">Documentation</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_612"/>
<field name="type">other</field>
</record>
@@ -2952,7 +2951,7 @@
<field name="code">612200</field>
<field name="name">Imprimés et fournitures de bureau</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_612"/>
<field name="type">other</field>
</record>
@@ -2960,7 +2959,7 @@
<field name="code">612300</field>
<field name="name">Téléphone</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_6123"/>
<field name="type">other</field>
</record>
@@ -2968,7 +2967,7 @@
<field name="code">612310</field>
<field name="name">Frais postaux</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_6123"/>
<field name="type">other</field>
</record>
@@ -2976,7 +2975,7 @@
<field name="code">612320</field>
<field name="name">Fax</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_6123"/>
<field name="type">other</field>
</record>
@@ -2984,7 +2983,7 @@
<field name="code">613000</field>
<field name="name">Redevances et royalties</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_613"/>
<field name="type">other</field>
</record>
@@ -2992,7 +2991,7 @@
<field name="code">613100</field>
<field name="name">Honoraires</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_613"/>
<field name="type">other</field>
</record>
@@ -3000,7 +2999,7 @@
<field name="code">613200</field>
<field name="name">Organismes de services</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_613"/>
<field name="type">other</field>
</record>
@@ -3008,7 +3007,7 @@
<field name="code">613300</field>
<field name="name">Commissions</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_613"/>
<field name="type">other</field>
</record>
@@ -3016,7 +3015,7 @@
<field name="code">614000</field>
<field name="name">Assurance incendie</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_61"/>
<field name="type">other</field>
</record>
@@ -3024,7 +3023,7 @@
<field name="code">615000</field>
<field name="name">Annonces, publicité</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_615"/>
<field name="type">other</field>
</record>
@@ -3032,7 +3031,7 @@
<field name="code">615100</field>
<field name="name">Cotisations et abonnements</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_615"/>
<field name="type">other</field>
</record>
@@ -3040,7 +3039,7 @@
<field name="code">615200</field>
<field name="name">Dons et libéralités</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_615"/>
<field name="type">other</field>
</record>
@@ -3048,7 +3047,7 @@
<field name="code">615300</field>
<field name="name">Publications légales</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_615"/>
<field name="type">other</field>
</record>
@@ -3056,7 +3055,7 @@
<field name="code">616000</field>
<field name="name">Sous-traitants</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_61"/>
<field name="type">other</field>
</record>
@@ -3064,7 +3063,7 @@
<field name="code">616100</field>
<field name="name">Transports par tiers</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_61"/>
<field name="type">other</field>
</record>
@@ -3072,7 +3071,7 @@
<field name="code">620000</field>
<field name="name">Rémunératons administrat. ou gérants</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_620"/>
<field name="type">other</field>
</record>
@@ -3080,7 +3079,7 @@
<field name="code">620100</field>
<field name="name">Rémunérations personnel de direction</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_620"/>
<field name="type">other</field>
</record>
@@ -3088,7 +3087,7 @@
<field name="code">620200</field>
<field name="name">Rémunérations employés</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_620"/>
<field name="type">other</field>
</record>
@@ -3096,7 +3095,7 @@
<field name="code">620300</field>
<field name="name">Rémunérations ouvriers</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_620"/>
<field name="type">other</field>
</record>
@@ -3104,7 +3103,7 @@
<field name="code">621000</field>
<field name="name">Chg.soc.lég.administ.et gérant</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_621"/>
<field name="type">other</field>
</record>
@@ -3112,7 +3111,7 @@
<field name="code">621100</field>
<field name="name">Chg.soc.lég. personnel de direction</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_621"/>
<field name="type">other</field>
</record>
@@ -3120,7 +3119,7 @@
<field name="code">621200</field>
<field name="name">Chg.soc.lég. employés</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_621"/>
<field name="type">other</field>
</record>
@@ -3128,7 +3127,7 @@
<field name="code">621300</field>
<field name="name">Chg.soc.lég. ouvriers</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_621"/>
<field name="type">other</field>
</record>
@@ -3136,7 +3135,7 @@
<field name="code">621400</field>
<field name="name">Assurance accidents</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_621"/>
<field name="type">other</field>
</record>
@@ -3144,7 +3143,7 @@
<field name="code">622000</field>
<field name="name">Primes patr. pour ass. extra - légales</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_62"/>
<field name="type">other</field>
</record>
@@ -3152,7 +3151,7 @@
<field name="code">623000</field>
<field name="name">Autres frais de personnel</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_62"/>
<field name="type">other</field>
</record>
@@ -3160,7 +3159,7 @@
<field name="code">624000</field>
<field name="name">Pension administrat. ou gérant</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_624"/>
<field name="type">other</field>
</record>
@@ -3168,7 +3167,7 @@
<field name="code">624100</field>
<field name="name">Pension personnel</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_624"/>
<field name="type">other</field>
</record>
@@ -3176,7 +3175,7 @@
<field name="code">630000</field>
<field name="name">Dot. cor. val s/frais d'établissement</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_630"/>
<field name="type">other</field>
</record>
@@ -3184,7 +3183,7 @@
<field name="code">630100</field>
<field name="name">Dot. cor. val s/immob. incorporels</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_630"/>
<field name="type">other</field>
</record>
@@ -3192,7 +3191,7 @@
<field name="code">630200</field>
<field name="name">Dot. cor. val s/immob. corporels</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_630"/>
<field name="type">other</field>
</record>
@@ -3200,7 +3199,7 @@
<field name="code">631000</field>
<field name="name">Dot. cor. val s/stock mat.fourni</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_631"/>
<field name="type">other</field>
</record>
@@ -3208,7 +3207,7 @@
<field name="code">631100</field>
<field name="name">Reprises cor. val. s/stock mat. fourni</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_631"/>
<field name="type">other</field>
</record>
@@ -3216,7 +3215,7 @@
<field name="code">632000</field>
<field name="name">Dot. cor. val s/en-cours,pr fini</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_632"/>
<field name="type">other</field>
</record>
@@ -3224,7 +3223,7 @@
<field name="code">632100</field>
<field name="name">Reprises cor. val s/en-cours,pf</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_632"/>
<field name="type">other</field>
</record>
@@ -3232,7 +3231,7 @@
<field name="code">633000</field>
<field name="name">Dot. cor. val s/cr comm +1an</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_633"/>
<field name="type">other</field>
</record>
@@ -3240,7 +3239,7 @@
<field name="code">633100</field>
<field name="name">Reprises cor. val s/cr com +1an</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_633"/>
<field name="type">other</field>
</record>
@@ -3248,7 +3247,7 @@
<field name="code">634000</field>
<field name="name">Dot. cor. val. s/cr comm -1an</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_634"/>
<field name="type">other</field>
</record>
@@ -3256,7 +3255,7 @@
<field name="code">634100</field>
<field name="name">Reprises cor. val.s/cr com -1an</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_634"/>
<field name="type">other</field>
</record>
@@ -3264,7 +3263,7 @@
<field name="code">635000</field>
<field name="name">Dot. prov. pension et oblig. sim.</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_635"/>
<field name="type">other</field>
</record>
@@ -3272,7 +3271,7 @@
<field name="code">635100</field>
<field name="name">Reprises prov. s/pens.obli. sim.</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_635"/>
<field name="type">other</field>
</record>
@@ -3280,7 +3279,7 @@
<field name="code">636000</field>
<field name="name">Dot. prov-grosses réparation</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_636"/>
<field name="type">other</field>
</record>
@@ -3288,7 +3287,7 @@
<field name="code">636100</field>
<field name="name">Reprises prov. grosses réparation</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_636"/>
<field name="type">other</field>
</record>
@@ -3296,7 +3295,7 @@
<field name="code">637000</field>
<field name="name">Dot. prov-autres risques et chg</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_637"/>
<field name="type">other</field>
</record>
@@ -3304,7 +3303,7 @@
<field name="code">637100</field>
<field name="name">Reprises prov autres risq,chg</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_637"/>
<field name="type">other</field>
</record>
@@ -3312,7 +3311,7 @@
<field name="code">640000</field>
<field name="name">Taxe d'abonnement</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_640"/>
<field name="type">other</field>
</record>
@@ -3320,7 +3319,7 @@
<field name="code">640100</field>
<field name="name">Impôt foncier</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_640"/>
<field name="type">other</field>
</record>
@@ -3328,7 +3327,7 @@
<field name="code">640200</field>
<field name="name">Impôt commercial s/le capital</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_640"/>
<field name="type">other</field>
</record>
@@ -3336,7 +3335,7 @@
<field name="code">640300</field>
<field name="name">Impôt s/la fortune</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_640"/>
<field name="type">other</field>
</record>
@@ -3344,7 +3343,7 @@
<field name="code">641000</field>
<field name="name">Moins-val. sur réalis. d'immob. corp.</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_64"/>
<field name="type">other</field>
</record>
@@ -3352,7 +3351,7 @@
<field name="code">642000</field>
<field name="name">Moins-val. / réalis. de créances comm.</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_64"/>
<field name="type">other</field>
</record>
@@ -3360,7 +3359,7 @@
<field name="code">643000</field>
<field name="name">Charges d'exploitation diverses</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_64"/>
<field name="type">other</field>
</record>
@@ -3368,7 +3367,7 @@
<field name="code">650000</field>
<field name="name">Intérêts, commissions et frais / dettes</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_65"/>
<field name="type">other</field>
</record>
@@ -3376,7 +3375,7 @@
<field name="code">651000</field>
<field name="name">Dot. cor. val s/actif circ</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_651"/>
<field name="type">other</field>
</record>
@@ -3384,7 +3383,7 @@
<field name="code">651100</field>
<field name="name">Reprises cor. val s/actif circulants</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_651"/>
<field name="type">other</field>
</record>
@@ -3392,7 +3391,7 @@
<field name="code">652000</field>
<field name="name">Moins-values sur réalis. d'actifs circ.</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_65"/>
<field name="type">other</field>
</record>
@@ -3400,7 +3399,7 @@
<field name="code">653000</field>
<field name="name">Charges d'escompte de créances</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_65"/>
<field name="type">other</field>
</record>
@@ -3408,7 +3407,7 @@
<field name="code">654000</field>
<field name="name">Différences de change</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_65"/>
<field name="type">other</field>
</record>
@@ -3416,7 +3415,7 @@
<field name="code">655000</field>
<field name="name">Ecarts de conversion des devises</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_65"/>
<field name="type">other</field>
</record>
@@ -3424,7 +3423,7 @@
<field name="code">656000</field>
<field name="name">Frais de banque</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_65"/>
<field name="type">other</field>
</record>
@@ -3432,7 +3431,7 @@
<field name="code">660000</field>
<field name="name">Dot. cor. val exceptionnelles</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_660"/>
<field name="type">other</field>
</record>
@@ -3440,7 +3439,7 @@
<field name="code">660100</field>
<field name="name">Reprises cor. val. excep</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_660"/>
<field name="type">other</field>
</record>
@@ -3448,7 +3447,7 @@
<field name="code">661000</field>
<field name="name">Dot. cor. val s/immob. financières</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_661"/>
<field name="type">other</field>
</record>
@@ -3456,7 +3455,7 @@
<field name="code">661100</field>
<field name="name">Reprises cor val s/immob. fin.</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_661"/>
<field name="type">other</field>
</record>
@@ -3464,7 +3463,7 @@
<field name="code">662000</field>
<field name="name">Dot. prov-risques et chg except.</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_662"/>
<field name="type">other</field>
</record>
@@ -3472,7 +3471,7 @@
<field name="code">662100</field>
<field name="name">Reprises prov risq,chg except.</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_662"/>
<field name="type">other</field>
</record>
@@ -3480,7 +3479,7 @@
<field name="code">663000</field>
<field name="name">Moins-values sur réalis. d'actifs immob.</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_66"/>
<field name="type">other</field>
</record>
@@ -3488,7 +3487,7 @@
<field name="code">665000</field>
<field name="name">Différences de change exceptionnelles</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_66"/>
<field name="type">other</field>
</record>
@@ -3496,7 +3495,7 @@
<field name="code">668000</field>
<field name="name">Autres charges exceptionnelles</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_66"/>
<field name="type">other</field>
</record>
@@ -3504,7 +3503,7 @@
<field name="code">670000</field>
<field name="name">Impôts luxemb sur le résultat de l'ex.</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_67"/>
<field name="type">other</field>
</record>
@@ -3512,7 +3511,7 @@
<field name="code">671000</field>
<field name="name">Impôts luxemb /résultat d'ex. antérieurs</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_67"/>
<field name="type">other</field>
</record>
@@ -3520,7 +3519,7 @@
<field name="code">672000</field>
<field name="name">Impôts étrangers sur le résultat de l'ex</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_67"/>
<field name="type">other</field>
</record>
@@ -3528,7 +3527,7 @@
<field name="code">673000</field>
<field name="name">Impôts étrgs/résultat d'ex. antérieurs</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_67"/>
<field name="type">other</field>
</record>
@@ -3536,7 +3535,7 @@
<field name="code">674000</field>
<field name="name">Impôts sur résultats exceptionnels</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_67"/>
<field name="type">other</field>
</record>
@@ -3544,7 +3543,7 @@
<field name="code">680000</field>
<field name="name">Transfert aux réserves immunisées</field>
<field name="user_type" ref="account_type_expense"/>
-
+
<field name="parent_id" ref="account_6"/>
<field name="type">other</field>
</record>
@@ -3552,7 +3551,7 @@
<field name="code">700000</field>
<field name="name">Ventes et prestations de services</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_70"/>
<field name="type">payable</field>
</record>
@@ -3560,7 +3559,7 @@
<field name="code">708000</field>
<field name="name">R.r.r accordés sur ventes</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_70"/>
<field name="type">payable</field>
</record>
@@ -3568,7 +3567,7 @@
<field name="code">712000</field>
<field name="name">Variation de stocks des encours de fabr.</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_71"/>
<field name="type">payable</field>
</record>
@@ -3576,7 +3575,7 @@
<field name="code">713000</field>
<field name="name">Variation de stocks des produits finis</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_71"/>
<field name="type">payable</field>
</record>
@@ -3584,7 +3583,7 @@
<field name="code">720000</field>
<field name="name">Travaux effect. par entreprise elle-même</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_7"/>
<field name="type">payable</field>
</record>
@@ -3592,7 +3591,7 @@
<field name="code">740000</field>
<field name="name">Subsides d'exploitation</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_74"/>
<field name="type">payable</field>
</record>
@@ -3600,7 +3599,7 @@
<field name="code">741000</field>
<field name="name">Plus-values sur réal. d'immob. corp.</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_74"/>
<field name="type">payable</field>
</record>
@@ -3608,7 +3607,7 @@
<field name="code">742000</field>
<field name="name">Plus-values sur réalis. créances comm.</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_74"/>
<field name="type">payable</field>
</record>
@@ -3616,7 +3615,7 @@
<field name="code">743000</field>
<field name="name">Récupération de frais de personnel</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_74"/>
<field name="type">payable</field>
</record>
@@ -3624,7 +3623,7 @@
<field name="code">744000</field>
<field name="name">Commissions et courtages</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_74"/>
<field name="type">payable</field>
</record>
@@ -3632,7 +3631,7 @@
<field name="code">745000</field>
<field name="name">Redevances pour brevets et licences</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_74"/>
<field name="type">payable</field>
</record>
@@ -3640,7 +3639,7 @@
<field name="code">746000</field>
<field name="name">Loyers perçus</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_74"/>
<field name="type">payable</field>
</record>
@@ -3648,7 +3647,7 @@
<field name="code">748000</field>
<field name="name">Produits d'exploitation divers.</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_74"/>
<field name="type">payable</field>
</record>
@@ -3656,7 +3655,7 @@
<field name="code">750000</field>
<field name="name">Produits des participations</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_750"/>
<field name="type">payable</field>
</record>
@@ -3664,7 +3663,7 @@
<field name="code">750100</field>
<field name="name">Autres produits des immob. financières</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_750"/>
<field name="type">payable</field>
</record>
@@ -3672,7 +3671,7 @@
<field name="code">751000</field>
<field name="name">Produits des valeurs mobilières</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_751"/>
<field name="type">payable</field>
</record>
@@ -3680,7 +3679,7 @@
<field name="code">751100</field>
<field name="name">Autres produits des actifs circulants</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_751"/>
<field name="type">payable</field>
</record>
@@ -3688,7 +3687,7 @@
<field name="code">752000</field>
<field name="name">Plus-values sur réalis. d'actifs circula</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_75"/>
<field name="type">payable</field>
</record>
@@ -3696,7 +3695,7 @@
<field name="code">753000</field>
<field name="name">Subsides en capital et en intérêts</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_75"/>
<field name="type">payable</field>
</record>
@@ -3704,7 +3703,7 @@
<field name="code">754000</field>
<field name="name">Différences de change</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_75"/>
<field name="type">payable</field>
</record>
@@ -3712,7 +3711,7 @@
<field name="code">754100</field>
<field name="name">Amendes pour retards de paiement</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_75"/>
<field name="type">payable</field>
</record>
@@ -3720,7 +3719,7 @@
<field name="code">754200</field>
<field name="name">Intérêts retards de paiement</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_75"/>
<field name="type">payable</field>
</record>
@@ -3728,7 +3727,7 @@
<field name="code">755000</field>
<field name="name">Ecarts de conversion de devises</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_75"/>
<field name="type">payable</field>
</record>
@@ -3736,7 +3735,7 @@
<field name="code">756000</field>
<field name="name">Autres produits financiers</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_75"/>
<field name="type">payable</field>
</record>
@@ -3744,7 +3743,7 @@
<field name="code">757000</field>
<field name="name">Escomptes obtenus</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_75"/>
<field name="type">payable</field>
</record>
@@ -3752,7 +3751,7 @@
<field name="code">763000</field>
<field name="name">Plus-values sur réalis. d'actifs immob.</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_7"/>
<field name="type">payable</field>
</record>
@@ -3760,7 +3759,7 @@
<field name="code">771000</field>
<field name="name">Régularis. d'impôts luxemb sur résultat</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_77"/>
<field name="type">payable</field>
</record>
@@ -3768,7 +3767,7 @@
<field name="code">773000</field>
<field name="name">Régularis. d'impôts étrangers / résultat</field>
<field name="user_type" ref="account_type_income"/>
-
+
<field name="parent_id" ref="account_77"/>
<field name="type">payable</field>
</record>
=== modified file 'l10n_lu/wizard/pdf_ext.py'
--- l10n_lu/wizard/pdf_ext.py 2010-02-24 10:55:29 +0000
+++ l10n_lu/wizard/pdf_ext.py 2010-08-13 13:36:19 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -64,7 +64,7 @@
keys = []
for line in lines:
if line.startswith('/V'):
- pass #print 'value',line
+ pass
elif line.startswith('/T'):
key = line[7:-2]
key = ''.join(key.split('\x00'))
@@ -85,7 +85,6 @@
for key in fields:
value = fields[key]
write_field(out, key, value)
-# write_field(out, key+"a", value) # pour copie-carbone sur autres pages
out.write(TAIL)
def extract_keys_from_pdf(filename):
=== modified file 'lunch/__openerp__.py'
--- lunch/__openerp__.py 2010-07-29 13:30:57 +0000
+++ lunch/__openerp__.py 2010-08-13 13:36:19 +0000
@@ -47,12 +47,9 @@
'lunch_view.xml',
'lunch_report.xml',
'report/report_lunch_order_view.xml',
- #'process/lunch_process.xml'
],
- "demo_xml": ['lunch_demo.xml',
- ],
- "test": ['test/test_lunch.yml'
- ],
+ "demo_xml": ['lunch_demo.xml'],
+ "test": ['test/test_lunch.yml'],
"installable": True,
}
=== modified file 'lunch/lunch.py'
--- lunch/lunch.py 2010-06-26 10:13:40 +0000
+++ lunch/lunch.py 2010-08-13 13:36:19 +0000
@@ -52,7 +52,7 @@
_defaults = {
'active': lambda *a : True,
- }
+ }
lunch_product()
@@ -82,7 +82,7 @@
'manager': fields.many2one('res.users', 'Manager'),
'name': fields.char('Name', size=30, required=True, unique = True),
'sum_remain': fields.function(amount_available, method=True, string='Remained Total'),
- }
+ }
lunch_cashbox()
@@ -100,10 +100,10 @@
'box': fields.many2one('lunch.cashbox', 'Box Name', size=30, required=True),
'active': fields.boolean('Active'),
'create_date': fields.datetime('Created date', readonly=True),
- }
+ }
_defaults = {
- 'active': lambda *a: True,
+ 'active': lambda *a: True,
}
lunch_cashmove()
@@ -215,7 +215,7 @@
'user_id': fields.many2one('res.users', 'User Name', readonly=True),
'amount': fields.float('Amount', readonly=True, digits=(16, 2)),
'box': fields.many2one('lunch.cashbox', 'Box Name', size=30, readonly=True),
- }
+ }
def init(self, cr):
=== modified file 'lunch/report/order.py'
--- lunch/report/order.py 2010-02-24 10:55:29 +0000
+++ lunch/report/order.py 2010-08-13 13:36:19 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -36,8 +36,8 @@
super(order, self).__init__(cr, uid, name, context)
self.localcontext.update({
- 'time': time,
- 'sum_price': self.sum_price,
+ 'time': time,
+ 'sum_price': self.sum_price,
})
report_sxw.report_sxw('report.lunch.order', 'lunch.order',
=== modified file 'lunch/report/report_lunch_order.py'
--- lunch/report/report_lunch_order.py 2010-06-22 12:26:04 +0000
+++ lunch/report/report_lunch_order.py 2010-08-13 13:36:19 +0000
@@ -37,7 +37,7 @@
'user_id': fields.many2one('res.users', 'User Name'),
'box_name': fields.char('Name', size=30),
'price_total':fields.float('Total Price', readonly=True),
- }
+ }
_order = 'date desc'
def init(self, cr):
tools.drop_view_if_exists(cr, 'report_lunch_order')
=== modified file 'lunch/wizard/lunch_cashbox_clean.py'
--- lunch/wizard/lunch_cashbox_clean.py 2010-06-16 11:51:39 +0000
+++ lunch/wizard/lunch_cashbox_clean.py 2010-08-13 13:36:19 +0000
@@ -48,12 +48,13 @@
and box IN %s" , (tuple(data),))
for (user_id, box_id, amount) in res:
- cashmove_ref.create(cr, uid, {'name': 'Summary for user' + str(user_id),
- 'amount': amount,
- 'user_cashmove': user_id,
- 'box': box_id,
- 'active': True,
- })
+ cashmove_ref.create(cr, uid, {
+ 'name': 'Summary for user' + str(user_id),
+ 'amount': amount,
+ 'user_cashmove': user_id,
+ 'box': box_id,
+ 'active': True,
+ })
return {}
lunch_cashbox_clean()
=== modified file 'lunch/wizard/lunch_order_confirm.py'
--- lunch/wizard/lunch_order_confirm.py 2010-03-17 10:43:25 +0000
+++ lunch/wizard/lunch_order_confirm.py 2010-08-13 13:36:19 +0000
@@ -29,8 +29,8 @@
_description = "confirm Order"
_columns = {
- 'confirm_cashbox':fields.many2one('lunch.cashbox', 'Name of box', required=True),
- }
+ 'confirm_cashbox':fields.many2one('lunch.cashbox', 'Name of box', required=True),
+ }
def confirm(self, cr, uid, ids, context):
"""
=== modified file 'mail_gateway/mail_gateway.py'
--- mail_gateway/mail_gateway.py 2010-08-13 05:38:52 +0000
+++ mail_gateway/mail_gateway.py 2010-08-13 13:36:19 +0000
@@ -60,10 +60,10 @@
default = {}
default.update({
- 'message_ids': [],
- 'date_closed': False,
- 'date_open': False
- })
+ 'message_ids': [],
+ 'date_closed': False,
+ 'date_open': False
+ })
return super(mailgate_thread, self).copy(cr, uid, id, default, context=context)
def message_new(self, cr, uid, msg, context):
@@ -134,7 +134,7 @@
if history:
for att in attach:
attachments.append(att_obj.create(cr, uid, {'name': att[0], 'datas': base64.encodestring(att[1])}))
-
+
for param in (email, email_cc, email_bcc):
if isinstance(param, list):
param = ", ".join(param)
@@ -163,7 +163,7 @@
mailgate_thread()
def format_date_tz(date, tz=None):
- if not date:
+ if not date:
return 'n/a'
format = tools.DEFAULT_SERVER_DATETIME_FORMAT
return tools.server_to_local_timestamp(date, format, format, tz)
@@ -213,7 +213,7 @@
'description': fields.text('Description', readonly=True),
'partner_id': fields.many2one('res.partner', 'Partner', required=False),
'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments', readonly=True),
- 'display_text': fields.function(_get_display_text, method=True, type='text', size="512", string='Display Text'),
+ 'display_text': fields.function(_get_display_text, method=True, type='text', size="512", string='Display Text'),
}
def init(self, cr):
@@ -246,7 +246,7 @@
@param cr: the current row, from the database cursor,
@param uid: the current user’s ID for security checks,
@param model: OpenObject Model
- @param res_ids: Ids of the record of OpenObject model created
+ @param res_ids: Ids of the record of OpenObject model created
@param msg: Email details
@param attach: Email attachments
"""
@@ -256,19 +256,19 @@
msg_pool = self.pool.get('mailgate.message')
for res_id in res_ids:
msg_data = {
- 'name': msg.get('subject', 'No subject'),
- 'date': msg.get('date'),
- 'description': msg.get('body', msg.get('from')),
- 'history': True,
- 'res_model': model,
- 'email_cc': msg.get('cc'),
- 'email_from': msg.get('from'),
- 'email_to': msg.get('to'),
- 'message_id': msg.get('message-id'),
- 'references': msg.get('references') or msg.get('in-reply-to'),
- 'res_id': res_id,
- 'user_id': uid,
- 'attachment_ids': [(6, 0, attach)]
+ 'name': msg.get('subject', 'No subject'),
+ 'date': msg.get('date'),
+ 'description': msg.get('body', msg.get('from')),
+ 'history': True,
+ 'res_model': model,
+ 'email_cc': msg.get('cc'),
+ 'email_from': msg.get('from'),
+ 'email_to': msg.get('to'),
+ 'message_id': msg.get('message-id'),
+ 'references': msg.get('references') or msg.get('in-reply-to'),
+ 'res_id': res_id,
+ 'user_id': uid,
+ 'attachment_ids': [(6, 0, attach)]
}
msg_pool.create(cr, uid, msg_data, context=context)
return True
=== modified file 'marketing/security/marketing_security.xml'
--- marketing/security/marketing_security.xml 2010-08-07 12:07:49 +0000
+++ marketing/security/marketing_security.xml 2010-08-13 13:36:19 +0000
@@ -6,4 +6,3 @@
</record>
</data>
</openerp>
-<!--group_marketing_user-->
=== modified file 'marketing_campaign/marketing_campaign.py'
--- marketing_campaign/marketing_campaign.py 2010-08-10 09:52:11 +0000
+++ marketing_campaign/marketing_campaign.py 2010-08-13 13:36:19 +0000
@@ -109,7 +109,7 @@
'campaign_id', 'Activities'),
'fixed_cost': fields.float('Fixed Cost', help="Fixed cost for the campaign (used for campaign analysis), see also variable cost on activities"),
}
-
+
_defaults = {
'state': lambda *a: 'draft',
'mode': lambda *a: 'test',
@@ -349,8 +349,6 @@
'from_ids': fields.one2many('marketing.campaign.transition',
'activity_to_id',
'Previous Activities'),
- #'subcampaign_id': fields.many2one('marketing.campaign', 'Sub-Campaign',
- # domain="[('object_id', '=', object_id)]"),
'variable_cost': fields.float('Variable Cost'),
'revenue': fields.float('Revenue'),
'signal': fields.char('Signal', size=128,
@@ -382,14 +380,14 @@
service = netsvc.LocalService('report.%s'%activity.report_id.report_name)
(report_data, format) = service.create(cr, uid, [], {}, {})
attach_vals = {
- 'name': '%s_%s_%s'%(activity.report_id.report_name,
- activity.name,workitem.partner_id.name),
- 'datas_fname': '%s.%s'%(activity.report_id.report_name,
- activity.report_id.report_type),
- 'parent_id': activity.report_directory_id.id,
- 'datas': base64.encodestring(report_data),
- 'file_type': format
- }
+ 'name': '%s_%s_%s'%(activity.report_id.report_name,
+ activity.name,workitem.partner_id.name),
+ 'datas_fname': '%s.%s'%(activity.report_id.report_name,
+ activity.report_id.report_type),
+ 'parent_id': activity.report_directory_id.id,
+ 'datas': base64.encodestring(report_data),
+ 'file_type': format
+ }
self.pool.get('ir.attachment').create(cr, uid, attach_vals)
return True
@@ -430,9 +428,10 @@
_name = "marketing.campaign.transition"
_description = "Campaign Transition"
- _interval_units = [('hours', 'Hour(s)'), ('days', 'Day(s)'),
- ('months', 'Month(s)'), ('years','Year(s)')]
-
+ _interval_units = [
+ ('hours', 'Hour(s)'), ('days', 'Day(s)'),
+ ('months', 'Month(s)'), ('years','Year(s)')
+ ]
def _get_name(self, cr, uid, ids, fn, args, context=None):
result = dict.fromkeys(ids, False)
@@ -597,7 +596,7 @@
}
wi_id = self.create(cr, uid, values, context=context)
- # Now, depending of the trigger and the campaign mode
+ # Now, depending of the trigger and the campaign mode
# we know if must run the newly created workitem.
#
# rows = transition trigger \ colums = campaign mode
@@ -606,7 +605,7 @@
# time Y N N N
# cosmetic N N N N
# auto Y Y Y Y
- #
+ #
run = transition.trigger == 'auto' \
or (transition.trigger == 'time' \
@@ -671,8 +670,10 @@
}
elif wi_obj.activity_id.type == 'paper':
- datas = {'ids': [wi_obj.res_id],
- 'model': wi_obj.object_id.model}
+ datas = {
+ 'ids': [wi_obj.res_id],
+ 'model': wi_obj.object_id.model
+ }
res = {
'type' : 'ir.actions.report.xml',
'report_name': wi_obj.activity_id.report_id.report_name,
@@ -689,9 +690,9 @@
_defaults = {
'object_name': lambda obj, cr, uid, context: context.get('object_id',False),
}
-
+
# TODO: add constraint to prevent disabling / disapproving an email account used in a running campaign
-
+
email_template()
class report_xml(osv.osv):
=== modified file 'marketing_campaign/marketing_campaign_view.xml'
--- marketing_campaign/marketing_campaign_view.xml 2010-08-11 07:32:52 +0000
+++ marketing_campaign/marketing_campaign_view.xml 2010-08-13 13:36:19 +0000
@@ -249,9 +249,6 @@
<field name="report_directory_id" attrs="{'required':[('type','=','paper')]}" />
</group>
<field name="server_action_id" attrs="{'required':[('type','=','action')],'invisible':[('type','!=','action')]}" domain="[('model_id','=',object_id)]" />
- <!--
- <field name="subcampaign_id" attrs="{'required':[('type','=','subcampaign')], 'invisible':[('type','!=','subcampaign')]}" />
- -->
</group>
</group>
<newline/>
=== modified file 'marketing_campaign/report/campaign_analysis.py'
--- marketing_campaign/report/campaign_analysis.py 2010-06-23 15:37:08 +0000
+++ marketing_campaign/report/campaign_analysis.py 2010-08-13 13:36:19 +0000
@@ -21,7 +21,7 @@
import tools
from osv import fields, osv
-class campaign_analysis(osv.osv): #{{{
+class campaign_analysis(osv.osv):
_name = "campaign.analysis"
_description = "Campaign Analysis"
_auto = False
@@ -43,22 +43,22 @@
return result
_columns = {
'year': fields.char('Year', size=4, readonly=True),
- 'month':fields.selection([('01','January'), ('02','February'),
- ('03','March'), ('04','April'),('05','May'), ('06','June'),
+ 'month':fields.selection([('01','January'), ('02','February'),
+ ('03','March'), ('04','April'),('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'),
- ('10','October'), ('11','November'), ('12','December')],
+ ('10','October'), ('11','November'), ('12','December')],
'Month', readonly=True),
'date': fields.date('Date', readonly=True),
- 'campaign_id': fields.many2one('marketing.campaign', 'Campaign',
+ 'campaign_id': fields.many2one('marketing.campaign', 'Campaign',
readonly=True),
'activity_id': fields.many2one('marketing.campaign.activity', 'Activity',
readonly=True),
- 'segment_id': fields.many2one('marketing.campaign.segment', 'Segment',
+ 'segment_id': fields.many2one('marketing.campaign.segment', 'Segment',
readonly=True),
'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
'country_id': fields.related('partner_id','address', 'country_id',
type='many2one', relation='res.country',string='Country'),
- 'total_cost' : fields.function(_total_cost, string='Cost', method=True,
+ 'total_cost' : fields.function(_total_cost, string='Cost', method=True,
type="float" ),
'revenue': fields.float('Revenue',digits=(16,2),readonly=True),
'count' : fields.integer('# of Actions', readonly=True),
@@ -89,4 +89,4 @@
wi.date::date
)
""")
-campaign_analysis() #}}}
+campaign_analysis()
=== modified file 'marketing_campaign/security/marketing_campaign_security.xml'
--- marketing_campaign/security/marketing_campaign_security.xml 2010-08-07 12:07:49 +0000
+++ marketing_campaign/security/marketing_campaign_security.xml 2010-08-13 13:36:19 +0000
@@ -5,9 +5,6 @@
<record id="base.res_groups_email_template_admin" model="res.groups">
<field name="name">Marketing / User</field>
</record>
- <!--record id="res_groups_marketing_campaign" model="res.groups">
- <field name="name">Marketing / Campaign</field>
- </record-->
</data>
</openerp>
=== modified file 'marketing_campaign_mailchimp/marketing_campaign_mailchimp.py'
--- marketing_campaign_mailchimp/marketing_campaign_mailchimp.py 2010-07-02 13:18:49 +0000
+++ marketing_campaign_mailchimp/marketing_campaign_mailchimp.py 2010-08-13 13:36:19 +0000
@@ -29,22 +29,22 @@
class mailchimp_account(osv.osv):
_name = "mailchimp.account"
-
+
_columns = {
- 'name': fields.char('Account Name', size=64),
- 'username': fields.char('Username', size=64, required=True),
- 'password': fields.char('Password', size=64, required=True),
- 'apikey': fields.char('API Key', size=128),
- 'data_center': fields.selection([('us1', 'US1'), ('us2', 'US2'),
- ('uk1', 'UK1')], 'Data Center'),
- 'state': fields.selection([('draft', 'Draft'), ('approved', 'Approved'),
- ('cancelled', 'Cancelled')], 'State', readonly=True)
- }
-
+ 'name': fields.char('Account Name', size=64),
+ 'username': fields.char('Username', size=64, required=True),
+ 'password': fields.char('Password', size=64, required=True),
+ 'apikey': fields.char('API Key', size=128),
+ 'data_center': fields.selection([('us1', 'US1'), ('us2', 'US2'),
+ ('uk1', 'UK1')], 'Data Center'),
+ 'state': fields.selection([('draft', 'Draft'), ('approved', 'Approved'),
+ ('cancelled', 'Cancelled')], 'State', readonly=True)
+ }
+
_defaults = {
- 'state': lambda *a: 'draft'
- }
-
+ 'state': lambda *a: 'draft'
+ }
+
def get_response(self, cr, uid, mailchimp_id, method, params={}):
mailchimp_account = self.browse(cr, uid, mailchimp_id)
params['output'] = 'json'
@@ -57,7 +57,7 @@
params = urllib.urlencode(params, doseq=True)
response = urllib2.urlopen(url, params)
return json.loads(response.read())
-
+
def button_approve(self, cr, uid, ids, context):
acc_obj = self.browse(cr, uid, ids)[0]
vals = {}
@@ -71,32 +71,34 @@
vals['apikey'] = response
vals['state'] = 'approved'
self.write(cr, uid, ids, vals)
- else :
+ else :
raise osv.except_osv('Error!!!',
"Can't approved accoutnt : %s"%response['error'])
return True
-
+
def button_cancel(self, cr, uid, ids, context):
self.write(cr, uid, ids, {'state': 'cancelled'})
return True
-
+
def add_partner_list(self, cr, uid, account_id, list_id, partner_ids):
vals = {} # just dictionary with partner_id and updated in list or not
for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids):
- params = {'id' : list_id,
+ params = {
+ 'id' : list_id,
'email_address' : partner.email,
'email_type':'text',
- 'merge_vars[FNAME]':partner.name ,
+ 'merge_vars[FNAME]':partner.name ,
'merge_vars[date]' : time.strftime('%Y-%m-%d'),
'merge_vars[phone]' : partner.phone,
'merge_vars[website]' : partner.website,
'merge_vars[address][country]' : partner.country.code,
'merge_vars[address][city]' : partner.city,
- 'double_optin':False}
+ 'double_optin':False
+ }
vals[partner.id] = self.get_response(cr, uid, account_id,
'listSubscribe', params)
return vals
-
+
mailchimp_account()
class mailchimp_list(osv.osv_memory):
@@ -115,28 +117,28 @@
_inherit = "marketing.campaign"
_columns = {
- 'mailchimp_account_id': fields.many2one(
- 'mailchimp.account', 'Account'),
- 'mailchimp_campaign': fields.char('campaign', size=64),
+ 'mailchimp_account_id': fields.many2one(
+ 'mailchimp.account', 'Account'),
+ 'mailchimp_campaign': fields.char('campaign', size=64),
}
marketing_campaign()
-
-
-class marketing_campaign_activity(osv.osv):
+
+
+class marketing_campaign_activity(osv.osv):
_inherit = "marketing.campaign.activity"
_columns = {
- 'mailchimp_account_id': fields.many2one(
- 'mailchimp.account', 'Account'),
- 'mailchimp_list': fields.char('List', size=64),
+ 'mailchimp_account_id': fields.many2one(
+ 'mailchimp.account', 'Account'),
+ 'mailchimp_list': fields.char('List', size=64),
}
-
+
def onchange_mailchimp(self, cr, uid, ids, mailchimp_account_id):
if mailchimp_account_id:
return {'value':{'mailchimp_list':''}}
return {'value':{}}
-
- def onchange_mailchimp_list(self, cr, uid, ids, mailchimp_account_id,
+
+ def onchange_mailchimp_list(self, cr, uid, ids, mailchimp_account_id,
mailchimp_list):
if mailchimp_account_id and mailchimp_list:
lists = self.pool.get('mailchimp.account').get_response(cr,
@@ -154,7 +156,7 @@
mc_acc_obj = self.pool.get('mailchimp.account')
lists = mc_acc_obj.get_response(cr, uid, mailchimp_account_id, 'lists')
list_id = ''
- for l in lists :
+ for l in lists :
if l['name'] == list_name:
list_id = l['id']
break;
@@ -163,34 +165,38 @@
model_obj = self.pool.get(res_model).browse(cr, uid, res_id)
params ={}
if res_model == 'res.partner' :
- params.update({'email_address' : model_obj.email,
- 'merge_vars[FNAME]':model_obj.name and model_obj.name or '',
- 'merge_vars[website]' : model_obj.website,
- 'merge_vars[address][country]' : model_obj.country.code,
- })
+ params.update({
+ 'email_address' : model_obj.email,
+ 'merge_vars[FNAME]':model_obj.name and model_obj.name or '',
+ 'merge_vars[website]' : model_obj.website,
+ 'merge_vars[address][country]' : model_obj.country.code,
+ })
elif res_model == 'crm.lead' :
- params.update({'email_address' : model_obj.email_from,
- 'merge_vars[FNAME]':model_obj.partner_name and \
- model_obj.partner_name or '',
- 'merge_vars[address][country]' : model_obj.country_id and \
- model_obj.country_id.code or ''
- })
+ params.update({
+ 'email_address' : model_obj.email_from,
+ 'merge_vars[FNAME]':model_obj.partner_name and \
+ model_obj.partner_name or '',
+ 'merge_vars[address][country]' : model_obj.country_id and \
+ model_obj.country_id.code or ''
+ })
if params['email_address'] :
user = mc_acc_obj.get_response(cr, uid, mailchimp_account_id,
- 'listMemberInfo',
- {'id' : list_id,
- 'email_address': params['email_address']})
- # if there s no user with the specify email it will return error code
+ 'listMemberInfo', {
+ 'id' : list_id,
+ 'email_address': params['email_address']
+ })
+ # if there s no user with the specify email it will return error code
# and thus we add that user otherwise user is alredy subscribe and there
# is no need to subscribe user again
if 'error' in user:
- params.update({'id' : list_id,
+ params.update({
+ 'id' : list_id,
'email_type':'text',
'double_optin':False,
'merge_vars[date]' : time.strftime('%Y-%m-%d'),
'merge_vars[address][city]' : model_obj.city and model_obj.city or '',
'merge_vars[phone]' : model_obj.phone and model_obj.phone or '',
- })
+ })
mc_acc_obj.get_response(cr, uid, mailchimp_account_id, 'listSubscribe', params)
# TODO handle mailchimp error
return True
=== modified file 'marketing_campaign_mailchimp/security/marketing_security.xml'
--- marketing_campaign_mailchimp/security/marketing_security.xml 2010-08-07 12:25:17 +0000
+++ marketing_campaign_mailchimp/security/marketing_security.xml 2010-08-13 13:36:19 +0000
@@ -8,4 +8,3 @@
</data>
</openerp>
-<!--group_marketing_user-->
=== modified file 'marketing_campaign_mailchimp/wizard/create_list.py'
--- marketing_campaign_mailchimp/wizard/create_list.py 2010-06-16 07:27:36 +0000
+++ marketing_campaign_mailchimp/wizard/create_list.py 2010-08-13 13:36:19 +0000
@@ -38,20 +38,17 @@
'Partner'),
}
-
+
def onchange_mailchimp_account_id(self, cr, uid, ids, mailchimp_account_id,
action):
- print mailchimp_account_id,action,
- return {'value':{}}
-
+ return {'value':{}}
+
def create_list(self, cr, uid, ids, context=None):
create_list_obj = self.browse(cr, uid, ids[0])
- print create_list_obj.id
mailchimp_account_obj = self.pool.get('mailchimp.account')
account_id = create_list_obj.mailchimp_account_id
lists = mailchimp_account_obj.get_response(cr, uid, account_id.id, 'lists')
lists = dict([(l['name'],l['id']) for l in lists])
- print lists
if create_list_obj.list_name not in lists.keys():
raise osv.except_osv(_('UserError'),
_('There is no list define in account %s') % (account_id.name))
=== modified file 'marketing_campaign_mailchimp/wizard/create_list_view.xml'
--- marketing_campaign_mailchimp/wizard/create_list_view.xml 2010-06-16 07:27:36 +0000
+++ marketing_campaign_mailchimp/wizard/create_list_view.xml 2010-08-13 13:36:19 +0000
@@ -11,9 +11,6 @@
<newline/>
<separator string="Partner" colspan="4"/>
<field name="partner_ids" nolabel="1" colspan="4"/>
- <!--group ">
- <field name="mailchimp_list_id" />
- </group-->
<group col="4" colspan="4">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="create_list" string="Update" type="object" icon="gtk-ok"/>
=== modified file 'membership/demo_data.xml'
--- membership/demo_data.xml 2010-06-26 10:13:40 +0000
+++ membership/demo_data.xml 2010-08-13 13:36:19 +0000
@@ -164,18 +164,4 @@
<field name="account_id" ref="account.a_sale"/>
</record>
</data>
-<!--
- <data>
- <workflow action="invoice_open" model="account.invoice" ref="account_invoice_2"/>
- </data>
-
- <data>
- <workflow action="invoice_open" model="account.invoice" ref="account_invoice_1"/>
- </data>
-
-
- <data>
- <workflow action="invoice_open" model="account.invoice" ref="account_invoice_0"/>
- </data>
--->
</openerp>
=== modified file 'membership/membership.py'
--- membership/membership.py 2010-07-20 13:43:26 +0000
+++ membership/membership.py 2010-08-13 13:36:19 +0000
@@ -37,14 +37,14 @@
]
STATE_PRIOR = {
- 'none' : 0,
- 'canceled' : 1,
- 'old' : 2,
- 'waiting' : 3,
- 'invoiced' : 4,
- 'free' : 6,
- 'paid' : 7
- }
+ 'none' : 0,
+ 'canceled' : 1,
+ 'old' : 2,
+ 'waiting' : 3,
+ 'invoiced' : 4,
+ 'free' : 6,
+ 'paid' : 7
+}
class membership_line(osv.osv):
'''Member line'''
@@ -81,7 +81,7 @@
@param ids: List of Membership Line IDs
@param name: Field Name
@param context: A standard dictionary for contextual values
- @param return: Dictionary of state Value
+ @param return: Dictionary of state Value
"""
res = {}
for line in self.browse(cr, uid, ids):
@@ -124,21 +124,21 @@
_description = __doc__
_name = 'membership.membership_line'
_columns = {
- 'partner': fields.many2one('res.partner', 'Partner', ondelete='cascade', select=1),
- 'membership_id': fields.many2one('product.product', string="Membership", required=True),
- 'date_from': fields.date('From', readonly=True),
- 'date_to': fields.date('To', readonly=True),
- 'date_cancel' : fields.date('Cancel date'),
- 'date': fields.date('Join Date'),
- 'member_price':fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True),
- 'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line', readonly=True),
- 'account_invoice_id': fields.related('account_invoice_line', 'invoice_id', type='many2one', relation='account.invoice', string='Invoice', readonly=True),
- 'state': fields.function(_state, method=True, string='State', type='selection', selection=STATE),
+ 'partner': fields.many2one('res.partner', 'Partner', ondelete='cascade', select=1),
+ 'membership_id': fields.many2one('product.product', string="Membership", required=True),
+ 'date_from': fields.date('From', readonly=True),
+ 'date_to': fields.date('To', readonly=True),
+ 'date_cancel' : fields.date('Cancel date'),
+ 'date': fields.date('Join Date'),
+ 'member_price':fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True),
+ 'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line', readonly=True),
+ 'account_invoice_id': fields.related('account_invoice_line', 'invoice_id', type='many2one', relation='account.invoice', string='Invoice', readonly=True),
+ 'state': fields.function(_state, method=True, string='State', type='selection', selection=STATE),
}
_rec_name = 'partner'
_order = 'id desc'
_constraints = [
- (_check_membership_date, 'Error, this membership product is out of date', [])
+ (_check_membership_date, 'Error, this membership product is out of date', [])
]
membership_line()
@@ -182,7 +182,7 @@
@param ids: List of Partner IDs
@param name: Field Name
@param context: A standard dictionary for contextual values
- @param return: Dictionary of Membership state Value
+ @param return: Dictionary of Membership state Value
"""
res = {}
for id in ids:
@@ -239,28 +239,28 @@
res_state = self._membership_state(cr, uid, [partner_data.associate_member.id], name, args, context)
res[id] = res_state[partner_data.associate_member.id]
return res
-
+
def _membership_date(self, cr, uid, ids, name, args, context=None):
-
+
"""Return date of membership"""
-
+
name = name[0]
res = {}
member_line_obj = self.pool.get('membership.membership_line')
-
+
for partner in self.browse(cr, uid, ids):
-
+
if partner.associate_member:
partner_id = partner.associate_member.id
else:
partner_id = partner.id
-
- res[partner.id]={
- 'membership_start': False,
- 'membership_stop': False,
- 'membership_cancel': False
- }
-
+
+ res[partner.id] = {
+ 'membership_start': False,
+ 'membership_stop': False,
+ 'membership_cancel': False
+ }
+
if name == 'membership_start':
line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
limit=1, order='date_from')
@@ -268,13 +268,13 @@
res[partner.id]['membership_start'] = member_line_obj.read(cr, uid, line_id[0],
['date_from'])['date_from']
- if name == 'membership_stop':
+ if name == 'membership_stop':
line_id1 = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
limit=1, order='date_to desc')
if line_id1:
res[partner.id]['membership_stop'] = member_line_obj.read(cr, uid, line_id1[0],
['date_to'])['date_to']
- if name == 'membership_cancel':
+ if name == 'membership_cancel':
if partner.membership_state == 'canceled':
line_id2 = member_line_obj.search(cr, uid, [('partner', '=', partner.id)],limit=1, order='date_cancel')
if line_id2:
@@ -366,7 +366,7 @@
default = default.copy()
default['member_lines'] = []
return super(Partner, self).copy(cr, uid, id, default, context)
-
+
def create_membership_invoice(self, cr, uid, ids, product_id=None, datas=None, context=None):
""" Create Customer Invoice of Membership for partners.
@param datas: datas has dictionary value which consist Id of Membership product and Cost Amount of Membership.
@@ -397,8 +397,8 @@
line_value = {
'product_id' : product_id,
}
-
- line_dict = invoice_line_obj.product_id_change(cr, uid, {},
+
+ line_dict = invoice_line_obj.product_id_change(cr, uid, {},
product_id, False, quantity, '', 'out_invoice', partner.id, fpos_id, price_unit=amount, context=context)
line_value.update(line_dict['value'])
if line_value.get('invoice_line_tax_id', False):
@@ -427,7 +427,7 @@
class product_template(osv.osv):
_inherit = 'product.template'
_columns = {
- 'member_price':fields.float('Member Price', digits_compute= dp.get_precision('Sale Price')),
+ 'member_price':fields.float('Member Price', digits_compute= dp.get_precision('Sale Price')),
}
product_template()
@@ -435,7 +435,7 @@
def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
model_obj = self.pool.get('ir.model.data')
-
+
if ('product' in context) and (context['product']=='membership_product'):
model_data_ids_form = model_obj.search(cr,user,[('model','=','ir.ui.view'),('name','in',['membership_products_form','membership_products_tree'])])
resource_id_form = model_obj.read(cr, user, model_data_ids_form, fields=['res_id','name'])
@@ -451,15 +451,14 @@
'''Product'''
_inherit = 'product.product'
_columns = {
- 'membership': fields.boolean('Membership', help='Specify if this product is a membership product'),
- 'membership_date_from': fields.date('Date from', help='Active Membership since this date'),
- 'membership_date_to': fields.date('Date to', help='Expired date of Membership'),
-# 'member_price':fields.float('Member Price'),
- }
+ 'membership': fields.boolean('Membership', help='Specify if this product is a membership product'),
+ 'membership_date_from': fields.date('Date from', help='Active Membership since this date'),
+ 'membership_date_to': fields.date('Date to', help='Expired date of Membership'),
+ }
_defaults = {
- 'membership': lambda *args: False
- }
+ 'membership': lambda *args: False
+ }
Product()
@@ -533,7 +532,7 @@
line = self.browse(cr, uid, result)
member_line_obj = self.pool.get('membership.membership_line')
if line.invoice_id.type == 'out_invoice':
-
+
ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)])
if line.product_id and line.product_id.membership and not ml_ids:
# Product line is a membership product
@@ -542,14 +541,14 @@
if line.invoice_id.date_invoice > date_from and line.invoice_id.date_invoice < date_to:
date_from = line.invoice_id.date_invoice
line_id = member_line_obj.create(cr, uid, {
- 'partner': line.invoice_id.partner_id and line.invoice_id.partner_id.id or False,
- 'membership_id': line.product_id.id,
- 'member_price': line.price_unit,
- 'date': time.strftime('%Y-%m-%d'),
- 'date_from': date_from,
- 'date_to': date_to,
- 'account_invoice_line': line.id,
- })
+ 'partner': line.invoice_id.partner_id and line.invoice_id.partner_id.id or False,
+ 'membership_id': line.product_id.id,
+ 'member_price': line.price_unit,
+ 'date': time.strftime('%Y-%m-%d'),
+ 'date_from': date_from,
+ 'date_to': date_to,
+ 'account_invoice_line': line.id,
+ })
return result
account_invoice_line()
=== modified file 'membership/membership_view.xml'
--- membership/membership_view.xml 2010-07-28 07:37:10 +0000
+++ membership/membership_view.xml 2010-08-13 13:36:19 +0000
@@ -28,14 +28,14 @@
<field name="model">product.product</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Membership products">
+ <form string="Membership products">
<field name="name"/>
<field name="default_code"/>
<field name="type"/>
<field name="categ_id"/>
<field name="membership_date_from" required="1"/>
<field name="membership_date_to" required="1"/>
- <field name="list_price" string="Membership Fee"/>
+ <field name="list_price" string="Membership Fee"/>
<separator colspan="4" string="Customer Taxes:"/>
<field name="taxes_id" colspan="4" nolabel="1"/>
</form>
@@ -84,9 +84,9 @@
<menuitem name="Memberships" parent="menu_membership"
id="menu_membership_products"
action="action_membership_products" sequence="1"/>
-
-
-
+
+
+
@@ -167,16 +167,6 @@
<menuitem name="Members" parent="menu_membership" id="menu_members" sequence="2" action="action_membership_members"/>
<!-- PARTNERS -->
-<!--
- <wizard
- string="Invoice Membership"
- model="res.partner"
- name="wizard_invoice_membership"
- id="wizard_invoice_membership"
- />
- -->
-
-
<record model="ir.ui.view" id="view_partner_tree">
<field name="name">res.partner.tree.form.inherit</field>
@@ -203,13 +193,13 @@
<button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" icon="gtk-apply"/>
<field colspan="4" name="associate_member" attrs="{'invisible':[('membership_state', '!=', 'none')], 'readonly':[('free_member','=',True)]}"/>
<field colspan="4" name="membership_state"/>
- </group>
+ </group>
</group>
<group colspan="2" col="2">
<field name="membership_start"/>
<field name="membership_stop"/>
<field name="membership_cancel"/>
- </group>
+ </group>
<field name="member_lines" nolabel="1" colspan="4" readonly="1">
<tree string="Memberships">
<field name="date"/>
@@ -219,14 +209,14 @@
<field name="state"/>
</tree>
<form string="Memberships">
- <field name="date"/>
+ <field name="date"/>
<field name="member_price"/>
<field name="membership_id"/>
<field name="account_invoice_id"/>
<field name="state" colspan="4"/>
</form>
- </field>
-
+ </field>
+
</page>
</notebook>
</field>
@@ -234,7 +224,7 @@
<!-- MEMBERSHIP/REPORTING -->
<menuitem name="Reporting" id="base.menu_report_association" parent="base.menu_association" sequence="20"/>
-
+
<!-- View for product.product object inherited from product module................ -->
<record model="ir.ui.view" id="view_product_form_inherit1">
<field name="name">product.normal.form</field>
=== modified file 'mrp/__openerp__.py'
--- mrp/__openerp__.py 2010-08-10 11:35:06 +0000
+++ mrp/__openerp__.py 2010-08-13 13:36:19 +0000
@@ -70,7 +70,6 @@
'wizard/mrp_price_view.xml',
'wizard/mrp_workcenter_load_view.xml',
'wizard/mrp_change_standard_price_view.xml',
-# 'wizard/mrp_track_prod_view.xml',
'mrp_view.xml',
'mrp_report.xml',
'company_view.xml',
@@ -84,7 +83,10 @@
],
- 'demo_xml': ['mrp_demo.xml', 'board_manufacturing_demo.xml'],
+ 'demo_xml': [
+ 'mrp_demo.xml',
+ 'board_manufacturing_demo.xml'
+ ],
'test': [
'test/mrp_packs.yml',
'test/mrp_phantom_bom.yml',
=== modified file 'mrp/board_manufacturing_demo.xml'
--- mrp/board_manufacturing_demo.xml 2010-06-25 12:20:26 +0000
+++ mrp/board_manufacturing_demo.xml 2010-08-13 13:36:19 +0000
@@ -1,13 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
- <!-- <record id="sc_manufacturing_dash" model="ir.ui.view_sc">
- <field name="name">Production dashboard</field>
- <field name="user_id" ref="base.user_root"/>
- <field name="resource">ir.ui.menu</field>
- <field name="sequence">4</field>
- <field name="res_id" ref="menu_board_manufacturing"/>
- </record> -->
<record id="base.user_root" model="res.users">
<field name="action_id" ref="open_board_manufacturing"/>
</record>
=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml 2010-08-12 14:31:06 +0000
+++ mrp/mrp_view.xml 2010-08-13 13:36:19 +0000
@@ -7,7 +7,6 @@
<menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="5"/>
<menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
-<!-- <menuitem name="Control" id="menu_mrp_control" parent="base.menu_mrp_root" sequence="3" />-->
<menuitem name="Master Data"
id="menu_mrp_bom"
parent="base.menu_mrp_root"
@@ -72,7 +71,7 @@
</form>
</field>
</record>
-
+
<record id="view_mrp_property_search" model="ir.ui.view">
<field name="name">mrp.property.search</field>
<field name="model">mrp.property</field>
@@ -91,8 +90,8 @@
</search>
</field>
</record>
-
-
+
+
<record id="mrp_property_action" model="ir.actions.act_window">
<field name="name">Properties</field>
<field name="type">ir.actions.act_window</field>
@@ -175,7 +174,7 @@
</form>
</field>
</record>
-
+
<!-- Search Views -->
<record id="view_mrp_workcenter_search" model="ir.ui.view">
@@ -283,8 +282,6 @@
<field name="view_id" ref="mrp_routing_tree_view"/>
<field name="help">Routings define the assembly operations to be done in work centers for manufacturing a certain product. They are usually attached to bills of materials which will define the assembly of products required for manufacture or for finished products.</field>
</record>
- <!-- <menuitem name="Routings" id="menu_mrp_routing_and_workcenters" parent="mrp.menu_mrp_bom" groups="base.group_extended"
- sequence="100" />-->
<menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="mrp.menu_mrp_property" groups="base.group_extended" sequence="40" />
<menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_property" groups="base.group_extended" sequence="30"/>
@@ -368,7 +365,7 @@
<filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}" />
<separator orientation="vertical"/>
<filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
-
+
</group>
</search>
</field>
@@ -415,10 +412,6 @@
<!-- BOM menus -->
- <!-- <menuitem name="Bill of Materials"
- id="menu_mrp_bom"
- parent="menu_mrp_bom"
- sequence="50" />-->
<menuitem
action="mrp_bom_form_action"
id="menu_mrp_bom_form_action"
@@ -483,10 +476,7 @@
<menuitem action="procurement.procurement_action" id="menu_mrp_procurement_action"
parent="mrp.menu_mrp_manufacturing" sequence="3" />
-<!-- <menuitem action="procurement.procurement_action5" id="menu_mrp_procurement_exception_action"-->
-<!-- parent="mrp.menu_mrp_control" sequence="1" />-->
-
- <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" groups="base.group_system,mrp.group_mrp_user,mrp.group_mrp_manager" sequence="3"/>
+ <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" groups="base.group_system,mrp.group_mrp_user,mrp.group_mrp_manager" sequence="3"/>
<menuitem action="procurement.action_compute_schedulers" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" sequence="90" groups="base.group_system,mrp.group_mrp_user,mrp.group_mrp_manager"/>
<!--
@@ -656,7 +646,7 @@
<field name="product_qty" string="Qty"/>
<field name="product_uom" string="UOM"/>
<field name="location_id" string="Source Loc."/>
- <field name="state" invisible="1"/>
+ <field name="state" invisible="1"/>
<button name="%(stock.move_scrap)d"
string="Scrap Products" type="action"
icon="gtk-convert" context="{'scrap': True}"
=== modified file 'mrp/report/workcenter_load.py'
--- mrp/report/workcenter_load.py 2010-08-05 07:21:34 +0000
+++ mrp/report/workcenter_load.py 2010-08-13 13:36:19 +0000
@@ -30,7 +30,6 @@
theme.use_color = 1
-#theme.scale = 2
random.seed(0)
#
=== modified file 'mrp/wizard/__init__.py'
--- mrp/wizard/__init__.py 2010-07-10 09:20:07 +0000
+++ mrp/wizard/__init__.py 2010-08-13 13:36:19 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -15,14 +15,13 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import mrp_product_produce
import mrp_price
import mrp_workcenter_load
-#import mrp_track_prod
import change_production_qty
import mrp_change_standard_price
=== modified file 'mrp/wizard/mrp_price.py'
--- mrp/wizard/mrp_price.py 2010-07-24 09:15:37 +0000
+++ mrp/wizard/mrp_price.py 2010-08-13 13:36:19 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -30,24 +30,24 @@
_defaults = {
'number': 1,
}
-
+
def print_report(self, cr, uid, ids, context=None):
""" To print the report of Product cost structure
@param self: The object pointer.
@param cr: A database cursor
@param uid: ID of the user currently logged in
- @param context: A standard dictionary
+ @param context: A standard dictionary
@return : Report
- """
+ """
datas = {'ids' : context.get('active_ids',[])}
res = self.read(cr, uid, ids, ['number'])
- res = res and res[0] or {}
+ res = res and res[0] or {}
datas['form'] = res
-
- return {
- 'type' : 'ir.actions.report.xml',
- 'report_name':'product.price',
- 'datas' : datas,
+
+ return {
+ 'type' : 'ir.actions.report.xml',
+ 'report_name':'product.price',
+ 'datas' : datas,
}
mrp_price()
=== modified file 'mrp/wizard/mrp_product_produce.py'
--- mrp/wizard/mrp_product_produce.py 2010-08-05 10:20:52 +0000
+++ mrp/wizard/mrp_product_produce.py 2010-08-13 13:36:19 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -24,10 +24,10 @@
class mrp_product_produce(osv.osv_memory):
_name = "mrp.product.produce"
_description = "Product Produce"
-
+
_columns = {
- 'product_qty': fields.float('Quantity', required=True),
- 'mode': fields.selection([('consume_produce', 'Consume & Produce'),
+ 'product_qty': fields.float('Quantity', required=True),
+ 'mode': fields.selection([('consume_produce', 'Consume & Produce'),
('consume', 'Consume Only')], 'Mode', required=True,
help="'Consume only' mode will only consume the products with the quantity selected.\n"
"'Consume & Produce' mode will consume as well as produce the products with the quantity selected "
@@ -40,35 +40,35 @@
@param cr: A database cursor
@param uid: ID of the user currently logged in
@param context: A standard dictionary
- @return: Quantity
- """
- prod = self.pool.get('mrp.production').browse(cr, uid,
+ @return: Quantity
+ """
+ prod = self.pool.get('mrp.production').browse(cr, uid,
context['active_id'], context=context)
done = 0.0
for move in prod.move_created_ids2:
if not move.scraped:
done += move.product_qty
return (prod.product_qty - done) or prod.product_qty
-
+
_defaults = {
- 'product_qty': _get_product_qty,
- 'mode': lambda *x: 'consume_produce'
- }
+ 'product_qty': _get_product_qty,
+ 'mode': lambda *x: 'consume_produce'
+ }
def do_produce(self, cr, uid, ids, context={}):
""" To check the product type
@param self: The object pointer.
@param cr: A database cursor
@param uid: ID of the user currently logged in
- @param ids: the ID or list of IDs if we want more than one
+ @param ids: the ID or list of IDs if we want more than one
@param context: A standard dictionary
- @return:
- """
+ @return:
+ """
prod_obj = self.pool.get('mrp.production')
move_ids = context['active_ids']
for data in self.read(cr, uid, ids):
for move_id in move_ids:
- prod_obj.action_produce(cr, uid, move_id,
+ prod_obj.action_produce(cr, uid, move_id,
data['product_qty'], data['mode'], context=context)
return {}
=== modified file 'mrp/wizard/mrp_workcenter_load.py'
--- mrp/wizard/mrp_workcenter_load.py 2010-04-05 12:28:03 +0000
+++ mrp/wizard/mrp_workcenter_load.py 2010-08-13 13:36:19 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -24,7 +24,7 @@
class mrp_workcenter_load(osv.osv_memory):
_name = 'mrp.workcenter.load'
_description = 'Workcenter Load'
-
+
_columns = {
'time_unit': fields.selection([('day', 'Day by day'),('week', 'Per week'),('month', 'Per month')],'Type of period', required=True),
'measure_unit': fields.selection([('hours', 'Amount in hours'),('cycles', 'Amount in cycles')],'Amount measuring unit', required=True),
@@ -35,18 +35,18 @@
@param self: The object pointer.
@param cr: A database cursor
@param uid: ID of the user currently logged in
- @param context: A standard dictionary
+ @param context: A standard dictionary
@return : Report
- """
+ """
datas = {'ids' : context.get('active_ids',[])}
res = self.read(cr, uid, ids, ['time_unit','measure_unit'])
- res = res and res[0] or {}
+ res = res and res[0] or {}
datas['form'] = res
-
- return {
- 'type' : 'ir.actions.report.xml',
- 'report_name':'mrp.workcenter.load',
- 'datas' : datas,
+
+ return {
+ 'type' : 'ir.actions.report.xml',
+ 'report_name':'mrp.workcenter.load',
+ 'datas' : datas,
}
mrp_workcenter_load()
=== modified file 'mrp_operations/process/mrp_operation_process.xml'
--- mrp_operations/process/mrp_operation_process.xml 2010-01-11 11:04:21 +0000
+++ mrp_operations/process/mrp_operation_process.xml 2010-08-13 13:36:19 +0000
@@ -28,7 +28,6 @@
</record>
<record id="process_node_workorder0" model="process.node">
-<!-- <field name="menu_id" ref="menu_mrp_production_operation_action"/>-->
<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
<field eval=""""state"""" name="kind"/>
<field eval=""""Information from the routing definition."""" name="note"/>
@@ -39,7 +38,6 @@
</record>
<record id="process_node_startoperation0" model="process.node">
-<!-- <field name="menu_id" ref="menu_mrp_production_operation_action"/>-->
<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
<field eval=""""state"""" name="kind"/>
<field eval=""""Start the operation."""" name="note"/>
@@ -50,7 +48,6 @@
</record>
<record id="process_node_doneoperation0" model="process.node">
-<!-- <field name="menu_id" ref="menu_mrp_production_operation_action"/>-->
<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
<field eval=""""state"""" name="kind"/>
<field eval=""""Finish the operation."""" name="note"/>
@@ -61,7 +58,6 @@
</record>
<record id="process_node_canceloperation0" model="process.node">
-<!-- <field name="menu_id" ref="menu_mrp_production_operation_action"/>-->
<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
<field eval=""""state"""" name="kind"/>
<field eval=""""Cancel the operation."""" name="note"/>
=== modified file 'mrp_repair/mrp_repair.py'
--- mrp_repair/mrp_repair.py 2010-08-05 12:16:59 +0000
+++ mrp_repair/mrp_repair.py 2010-08-13 13:36:19 +0000
@@ -41,7 +41,7 @@
@param field_name: Name of field.
@param arg: Argument
@param context: A standard dictionary for contextual values
- @return: Dictionary of values.
+ @return: Dictionary of values.
"""
res = {}
cur_obj = self.pool.get('res.currency')
@@ -59,7 +59,7 @@
""" Calculates taxed amount.
@param field_name: Name of field.
@param arg: Argument
- @return: Dictionary of values.
+ @return: Dictionary of values.
"""
res = {}
cur_obj = self.pool.get('res.currency')
@@ -82,7 +82,7 @@
""" Calculates total amount.
@param field_name: Name of field.
@param arg: Argument
- @return: Dictionary of values.
+ @return: Dictionary of values.
"""
res = {}
untax = self._amount_untaxed(cr, uid, ids, field_name, arg, context)
@@ -167,7 +167,7 @@
def onchange_product_id(self, cr, uid, ids, product_id=None):
""" On change of product sets some values.
@param product_id: Changed product
- @return: Dictionary of values.
+ @return: Dictionary of values.
"""
return {'value': {
'prodlot_id': False,
@@ -183,7 +183,7 @@
destination location, partner and partner address.
@param prod_id: Id of product in current record.
@param move_id: Changed move.
- @return: Dictionary of values.
+ @return: Dictionary of values.
"""
data = {}
data['value'] = {}
@@ -210,11 +210,11 @@
return True
def onchange_partner_id(self, cr, uid, ids, part, address_id):
- """ On change of partner sets the values of partner address,
+ """ On change of partner sets the values of partner address,
partner invoice address and pricelist.
@param part: Changed id of partner.
@param address_id: Address id from current record.
- @return: Dictionary of values.
+ @return: Dictionary of values.
"""
part_obj = self.pool.get('res.partner')
pricelist_obj = self.pool.get('product.pricelist')
@@ -240,7 +240,7 @@
destination location, move and guarantee limit.
@param lot: Changed id of production lot.
@param product_id: Product id from current record.
- @return: Dictionary of values.
+ @return: Dictionary of values.
"""
prodlot_obj = self.pool.get('stock.production.lot')
move_obj = self.pool.get('stock.move')
@@ -275,7 +275,7 @@
def action_cancel_draft(self, cr, uid, ids, *args):
""" Cancels repair order when it is in 'Draft' state.
@param *arg: Arguments
- @return: True
+ @return: True
"""
if not len(ids):
return False
@@ -292,7 +292,7 @@
""" Repair order state is set to 'To be invoiced' when invoice method
is 'Before repair' else state becomes 'Confirmed'.
@param *arg: Arguments
- @return: True
+ @return: True
"""
mrp_line_obj = self.pool.get('mrp.repair.line')
for o in self.browse(cr, uid, ids):
@@ -305,7 +305,7 @@
def action_cancel(self, cr, uid, ids, context=None):
""" Cancels repair order.
- @return: True
+ @return: True
"""
ok=True
mrp_line_obj = self.pool.get('mrp.repair.line')
@@ -320,7 +320,7 @@
def action_invoice_create(self, cr, uid, ids, group=False, context=None):
""" Creates invoice(s) for repair order.
@param group: It is set to true when group invoice is to be generated.
- @return: Invoice Ids.
+ @return: Invoice Ids.
"""
res = {}
invoices_group = {}
@@ -328,7 +328,7 @@
inv_obj = self.pool.get('account.invoice')
repair_line_obj = self.pool.get('mrp.repair.line')
repair_fee_obj = self.pool.get('mrp.repair.fee')
- for repair in self.browse(cr, uid, ids, context=context):
+ for repair in self.browse(cr, uid, ids, context=context):
res[repair.id] = False
if repair.state in ('draft','cancel') or repair.invoice_id:
continue
@@ -382,14 +382,14 @@
'invoice_id': inv_id,
'name': name,
'origin': repair.name,
- 'account_id': account_id,
+ 'account_id': account_id,
'quantity': operation.product_uom_qty,
'invoice_line_tax_id': [(6,0,[x.id for x in operation.tax_id])],
'uos_id': operation.product_uom.id,
'price_unit': operation.price_unit,
'price_subtotal': operation.product_uom_qty*operation.price_unit,
'product_id': operation.product_id and operation.product_id.id or False
- })
+ })
repair_line_obj.write(cr, uid, [operation.id], {'invoiced': True, 'invoice_line_id': invoice_line_id})
for fee in repair.fees_lines:
if fee.to_invoice == True:
@@ -408,35 +408,35 @@
'product_id': fee.product_id and fee.product_id.id or False,
'price_unit': fee.price_unit,
'price_subtotal': fee.product_uom_qty*fee.price_unit
- })
+ })
repair_fee_obj.write(cr, uid, [fee.id], {'invoiced': True, 'invoice_line_id': invoice_fee_id})
res[repair.id] = inv_id
return res
def action_repair_ready(self, cr, uid, ids, context=None):
""" Writes repair order state to 'Ready'
- @return: True
+ @return: True
"""
self.write(cr, uid, ids, {'state': 'ready'})
return True
def action_invoice_cancel(self, cr, uid, ids, context=None):
""" Writes repair order state to 'Exception in invoice'
- @return: True
+ @return: True
"""
self.write(cr, uid, ids, {'state': 'invoice_except'})
return True
def action_repair_start(self, cr, uid, ids, context=None):
""" Writes repair order state to 'Under Repair'
- @return: True
+ @return: True
"""
self.write(cr, uid, ids, {'state': 'under_repair'})
return True
def action_invoice_end(self, cr, uid, ids, context=None):
""" Writes repair order state to 'Ready' if invoice method is Before repair.
- @return: True
+ @return: True
"""
for order in self.browse(cr, uid, ids):
val = {}
@@ -448,9 +448,9 @@
return True
def action_repair_end(self, cr, uid, ids, context=None):
- """ Writes repair order state to 'To be invoiced' if invoice method is
+ """ Writes repair order state to 'To be invoiced' if invoice method is
After repair else state is set to 'Ready'.
- @return: True
+ @return: True
"""
for order in self.browse(cr, uid, ids):
val = {}
@@ -470,7 +470,7 @@
def action_repair_done(self, cr, uid, ids, context=None):
""" Creates stock move and picking for repair order.
- @return: Picking ids.
+ @return: Picking ids.
"""
res = {}
move_obj = self.pool.get('stock.move')
@@ -516,7 +516,7 @@
'location_id': repair.location_id.id,
'location_dest_id': repair.location_dest_id.id,
'tracking_id': False,
- 'state': 'assigned',
+ 'state': 'assigned',
})
wf_service.trg_validate(uid, 'stock.picking', picking, 'button_confirm', cr)
self.write(cr, uid, [repair.id], {'state': 'done', 'picking_id': picking})
@@ -530,7 +530,7 @@
class ProductChangeMixin(object):
- def product_id_change(self, cr, uid, ids, pricelist, product, uom=False,
+ def product_id_change(self, cr, uid, ids, pricelist, product, uom=False,
product_uom_qty=0, partner_id=False, guarantee_limit=False):
""" On change of product it sets product quantity, tax account, name,
uom of product, unit price and price subtotal.
@@ -574,7 +574,7 @@
'message':
"Couldn't find a pricelist line matching this product and quantity.\n"
"You have to change either the product, the quantity or the pricelist."
- }
+ }
else:
result.update({'price_unit': price, 'price_subtotal': price*product_uom_qty})
@@ -594,7 +594,7 @@
""" Calculates amount.
@param field_name: Name of field.
@param arg: Argument
- @return: Dictionary of values.
+ @return: Dictionary of values.
"""
res = {}
cur_obj=self.pool.get('res.currency')
@@ -672,17 +672,17 @@
class mrp_repair_fee(osv.osv, ProductChangeMixin):
_name = 'mrp.repair.fee'
_description = 'Repair Fees Line'
-
+
def copy_data(self, cr, uid, id, default=None, context=None):
if not default: default = {}
default.update({'invoice_line_id': False, 'invoiced': False})
return super(mrp_repair_fee, self).copy_data(cr, uid, id, default, context)
-
+
def _amount_line(self, cr, uid, ids, field_name, arg, context):
""" Calculates amount.
@param field_name: Name of field.
@param arg: Argument
- @return: Dictionary of values.
+ @return: Dictionary of values.
"""
res = {}
cur_obj = self.pool.get('res.currency')
=== modified file 'mrp_repair/mrp_repair_workflow.xml'
--- mrp_repair/mrp_repair_workflow.xml 2008-12-03 11:29:25 +0000
+++ mrp_repair/mrp_repair_workflow.xml 2010-08-13 13:36:19 +0000
@@ -6,7 +6,7 @@
<field name="osv">mrp.repair</field>
<field name="on_create">True</field>
</record>
-
+
<!-- Activity -->
<record id="act_draft" model="workflow.activity">
<field name="wkf_id" ref="wkf_repair"/>
@@ -32,7 +32,7 @@
<record id="act_repair_ready" model="workflow.activity">
<field name="wkf_id" ref="wkf_repair"/>
<field name="name">Ready Repair</field>
- <field name="kind">function</field>
+ <field name="kind">function</field>
<field name="action">action_repair_ready()</field>
</record>
<record id="act_cancel3" model="workflow.activity">
@@ -50,19 +50,12 @@
<field name="action">wkf_repair_done()</field>
<field name="join_mode">XOR</field>
</record>
- <!-- <record id="act_invoice" model="workflow.activity">
- <field name="wkf_id" ref="wkf_repair"/>
- <field name="name">invoice</field>
- <field name="kind">subflow</field>
- <field name="subflow_id" search="[('name','=','account.invoice.basic')]"/>
- <field name="action">action_invoice_create()</field>
- </record> -->
<record id="act_repair_start" model="workflow.activity">
<field name="wkf_id" ref="wkf_repair"/>
<field name="name">Start Repair</field>
- <field name="kind">function</field>
+ <field name="kind">function</field>
<field name="action">action_repair_start()</field>
- </record>
+ </record>
<record id="act_invoice_end" model="workflow.activity">
<field name="wkf_id" ref="wkf_repair"/>
<field name="name">invoice_end</field>
@@ -75,21 +68,6 @@
<field name="kind">function</field>
<field name="action">action_repair_end()</field>
</record>
-
- <!-- <record id="act_invoice_cancel" model="workflow.activity">
- <field name="wkf_id" ref="wkf_repair"/>
- <field name="name">invoice_cancel</field>
- <field name="flow_stop">True</field>
- <field name="kind">stopall</field>
- <field name="action">action_cancel()</field>
- </record>
- <record id="act_invoice_except" model="workflow.activity">
- <field name="wkf_id" ref="wkf_repair"/>
- <field name="name">invoice_except</field>
- <field name="kind">function</field>
- <field name="action">action_invoice_cancel()</field>
- </record> -->
-
<record id="act_cancel" model="workflow.activity">
<field name="wkf_id" ref="wkf_repair"/>
<field name="name">cancel</field>
@@ -106,25 +84,25 @@
</record>
- <!-- Transistion -->
-
-
+ <!-- Transistion -->
+
+
<record id="trans_draft_confirm" model="workflow.transition">
<field name="act_from" ref="act_draft"/>
<field name="act_to" ref="act_confirm"/>
<field name="signal">repair_confirm</field>
</record>
-
+
<record id="trans_draft_cancel" model="workflow.transition">
<field name="act_from" ref="act_draft"/>
<field name="act_to" ref="act_cancel"/>
<field name="signal">cancel</field>
</record>
-
+
<record id="trans_confirm_wait_invoice" model="workflow.transition">
<field name="act_from" ref="act_confirm"/>
<field name="act_to" ref="act_wait_invoice"/>
- <field name="condition">invoice_method=='b4repair'</field>
+ <field name="condition">invoice_method=='b4repair'</field>
</record>
<record id="trans_confirm_wait_ship" model="workflow.transition">
@@ -133,17 +111,11 @@
<field name="condition">(invoice_method=='after_repair' or invoice_method=='none')</field>
</record>
- <!-- <record id="trans_confirm_wait_invoice_shipping" model="workflow.transition">
- <field name="act_from" ref="act_wait_invoice"/>
- <field name="act_to" ref="act_invoice_end"/>
- <field name="condition">(invoice_method=='none')</field>
- </record> -->
-
<record id="trans_wait_invoice_invoice" model="workflow.transition">
<field name="act_from" ref="act_wait_invoice"/>
<field name="act_to" ref="act_invoice_end"/>
<field name="signal">action_invoice_create</field>
- </record>
+ </record>
<record id="trans_invoice_start_repair" model="workflow.transition">
<field name="act_from" ref="act_invoice_end"/>
@@ -177,8 +149,8 @@
<record id="trans_repair_repair_end" model="workflow.transition">
<field name="act_from" ref="act_repair_start"/>
- <field name="act_to" ref="act_repair_end"/>
- <field name="signal">action_repair_end</field>
+ <field name="act_to" ref="act_repair_end"/>
+ <field name="signal">action_repair_end</field>
</record>
<record id="trans_reapir_end_done" model="workflow.transition">
=== modified file 'mrp_repair/wizard/make_invoice.py'
--- mrp_repair/wizard/make_invoice.py 2010-04-06 06:52:09 +0000
+++ mrp_repair/wizard/make_invoice.py 2010-08-13 13:36:19 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -15,19 +15,19 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import netsvc
-from osv import osv, fields
+from osv import osv, fields
class make_invoice(osv.osv_memory):
_name = 'mrp.repair.make_invoice'
_description = 'Make Invoice'
-
+
_columns = {
- 'group': fields.boolean('Group by partner invoice address'),
+ 'group': fields.boolean('Group by partner invoice address'),
}
def make_invoices(self, cr, uid, ids, context):
@@ -35,15 +35,15 @@
@param self: The object pointer.
@param cr: A database cursor
@param uid: ID of the user currently logged in
- @param ids: List of IDs selected
- @param context: A standard dictionary
+ @param ids: List of IDs selected
+ @param context: A standard dictionary
@return: Loads the view of new invoice(s).
"""
inv = self.browse(cr, uid, ids[0])
- order_obj = self.pool.get('mrp.repair')
- newinv = order_obj.action_invoice_create(cr, uid, context['active_ids'],
- group=inv.group,context=context)
-
+ order_obj = self.pool.get('mrp.repair')
+ newinv = order_obj.action_invoice_create(cr, uid, context['active_ids'],
+ group=inv.group,context=context)
+
return {
'domain': [('id','in', newinv.values())],
'name': 'Invoices',
=== modified file 'mrp_subproduct/__openerp__.py'
--- mrp_subproduct/__openerp__.py 2010-08-06 08:51:12 +0000
+++ mrp_subproduct/__openerp__.py 2010-08-13 13:36:19 +0000
@@ -36,7 +36,10 @@
'website': 'http://www.openerp.com',
'depends': ['base', 'mrp'],
'init_xml': [],
- 'update_xml': ['security/ir.model.access.csv', 'mrp_subproduct_view.xml'],
+ 'update_xml': [
+ 'security/ir.model.access.csv',
+ 'mrp_subproduct_view.xml'
+ ],
'demo_xml': [],
'test': ['test/mrp_subproduct.yml'],
'installable': True,
=== modified file 'multi_company/__openerp__.py'
--- multi_company/__openerp__.py 2010-07-28 11:43:44 +0000
+++ multi_company/__openerp__.py 2010-08-13 13:36:19 +0000
@@ -38,7 +38,6 @@
'init_xml': [],
'update_xml': [
'res_company_view.xml'
- #'security/ir.model.access.csv',
],
'demo_xml': [
'multi_company_demo.xml'
=== modified file 'multi_company/multi_company_demo.xml'
--- multi_company/multi_company_demo.xml 2010-08-07 07:34:17 +0000
+++ multi_company/multi_company_demo.xml 2010-08-13 13:36:19 +0000
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
-<!-- Partner -->
+<!-- Partner -->
<record id="base.main_partner" model="res.partner">
<field name="name">OpenERP Corp.</field>
</record>
@@ -20,8 +20,8 @@
<record id="res_partner_odoo" model="res.partner">
<field name="name">Odoo</field>
</record>
-
-<!-- Company -->
+
+<!-- Company -->
<record id="base.main_company" model="res.company">
<field name="name">OpenERP Corp.</field>
<field name="currency_id" ref="base.EUR"/>
@@ -56,7 +56,7 @@
<field name="currency_id" ref="base.EUR"/>
<field name="name">Odoo</field>
</record>
-
+
<!-- User -->
<record id="res_users_editor_demo" model="res.users">
@@ -104,7 +104,7 @@
<!--
Resource: product.product
-->
-
+
<record id="product.product_product_0" model="product.product">
<field name="company_id" ref="res_company_oerp_editor"/>
</record>
@@ -312,11 +312,11 @@
</record>
-
+
<!--
Resource: res.partner
-->
-
+
<record id="base.res_partner_asus" model="res.partner">
<field name="company_id" ref="res_company_oerp_us"/>
</record>
@@ -379,90 +379,7 @@
</record>
<record id="base.res_partner_accent" model="res.partner">
<field name="company_id" ref="res_company_oerp_be"/>
- </record>
-
-<!-- CRM -->
-<!--
- <record id="crm.crm_case_claim01" model="crm.case">
- <field name="company_id" ref="res_company_oerp_be"/>
- </record>
- <record id="crm.crm_case_claim02" model="crm.case">
- <field name="company_id" ref="res_company_oerp_us"/>
- </record>
- <record id="crm.crm_case_claim03" model="crm.case">
- <field name="company_id" ref="res_company_oerp_be"/>
- </record>
- <record id="crm.crm_case_claim04" model="crm.case">
- <field name="company_id" ref="res_company_oerp_in"/>
- </record>
- <record id="crm.crm_case_claim05" model="crm.case">
- <field name="company_id" ref="res_company_oerp_be"/>
- </record>
- <record id="crm.crm_case_claim06" model="crm.case">
- <field name="company_id" ref="res_company_oerp_us"/>
- </record>
-
- <record id="crm.crm_case_construstazunits0" model="crm.case">
- <field name="company_id" ref="res_company_oerp_be"/>
- </record>
- <record id="crm.crm_case_rdroundfundingunits0" model="crm.case">
- <field name="company_id" ref="res_company_oerp_be"/>
- </record>
- <record id="crm.crm_case_mediapoleunits0" model="crm.case">
- <field name="company_id" ref="res_company_oerp_us"/>
- </record>
- <record id="crm.crm_case_abcfuelcounits0" model="crm.case">
- <field name="company_id" ref="res_company_oerp_in"/>
- </record>
- <record id="crm.crm_case_dirtminingltdunits0" model="crm.case">
- <field name="company_id" ref="res_company_oerp_us"/>
- </record>
--->
-<!--For Bug Tracking-->
-<!--
- <record id="crm.crm_case_buginaccountsmodule0" model="crm.case">
- <field name="company_id" ref="res_company_oerp_be"/>
- </record>
- <record id="crm.crm_case_programnotgivingproperoutput0" model="crm.case">
- <field name="company_id" ref="res_company_oerp_us"/>
- </record>
- <record id="crm.crm_case_outputincorrect0" model="crm.case">
- <field name="company_id" ref="res_company_oerp_us"/>
- </record>
- <record id="crm.crm_case_problemloadingpage0" model="crm.case">
- <field name="company_id" ref="res_company_oerp_be"/>
- </record>
- <record id="crm.crm_case_pagenotfound0" model="crm.case">
- <field name="company_id" ref="res_company_oerp_in"/>
- </record>
- <record id="crm.crm_case_programmingerror0" model="crm.case">
- <field name="company_id" ref="res_company_oerp_be"/>
- </record>
- <record id="crm.crm_case_logicalerrorinprogram0" model="crm.case">
- <field name="company_id" ref="res_company_oerp_be"/>
- </record>
- <record id="crm.crm_case_constrainterror0" model="crm.case">
- <field name="company_id" ref="res_company_oerp_us"/>
- </record>
- <record id="crm.crm_case_errorinprogram0" model="crm.case">
- <field name="company_id" ref="res_company_oerp_be"/>
- </record>
- <record id="crm.crm_case_newfeaturestobeadded0" model="crm.case">
- <field name="company_id" ref="res_company_oerp_be"/>
- </record>
- <record id="crm.crm_case_addmenustothemodule0" model="crm.case">
- <field name="company_id" ref="res_company_oerp_be"/>
- </record>
- <record id="crm.crm_case_includeattendancesheetinproject0" model="crm.case">
- <field name="company_id" ref="res_company_oerp_be"/>
- </record>
- <record id="crm.crm_case_createnewobject0" model="crm.case">
- <field name="company_id" ref="res_company_oerp_be"/>
- </record>
- <record id="crm.crm_case_improvereportsinhrms0" model="crm.case">
- <field name="company_id" ref="res_company_oerp_in"/>
- </record>
--->
+ </record>
</data>
<data noupdate="1">
<record id="multi_company_default_productopenerpus0" model="multi_company.default">
=== modified file 'olap/__openerp__.py'
--- olap/__openerp__.py 2010-07-28 11:43:44 +0000
+++ olap/__openerp__.py 2010-08-13 13:36:19 +0000
@@ -46,8 +46,7 @@
"data/olap_security.xml",
'security/ir.model.access.csv'
],
- "demo_xml" : ["data/olap_demo.xml"
- ],
+ "demo_xml" : ["data/olap_demo.xml"],
"active": False,
"installable": True
}
=== modified file 'olap/data/olap_cube_view.xml'
--- olap/data/olap_cube_view.xml 2010-07-29 05:03:44 +0000
+++ olap/data/olap_cube_view.xml 2010-08-13 13:36:19 +0000
@@ -3,7 +3,7 @@
<data>
<!-- Wizard view for the load data -->
-
+
<record id="bi_load_db_form" model="ir.ui.view">
<field name="name">bi.load.db.form</field>
<field name="model">bi.load.db.wizard</field>
@@ -22,7 +22,7 @@
</form>
</field>
</record>
-
+
<record id="act_bi_load_db_wizard" model="ir.actions.act_window">
<field name="name">Load database Structure</field>
<field name="res_model">bi.load.db.wizard</field>
@@ -33,10 +33,10 @@
<field name="auto_refresh" eval="1"/>
<field name="target">new</field>
</record>
-
-
+
+
<!-- Wizard For Olap Warehouse -->
-
+
<record id="view_warehouse_bi" model="ir.ui.view">
<field name="name">Olap Warehouse</field>
<field name="model">olap.warehouse.wizard</field>
@@ -51,7 +51,7 @@
</form>
</field>
</record>
-
+
<record id="action_olap_warehouse" model="ir.actions.act_window">
<field name="name">Olap Warehouse</field>
<field name="type">ir.actions.act_window</field>
@@ -60,7 +60,7 @@
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
-
+
<menuitem
name="Olap Warehouse"
action="action_olap_warehouse"
@@ -68,9 +68,9 @@
sequence="51"
parent="base.next_id_50"
/>
-
+
<!-- Wizard View for the parameters wizard -->
-
+
<record id="view_config_bi" model="ir.ui.view">
<field name="name">Parameters Configuration</field>
<field name="model">olap.parameters.config.wizard</field>
@@ -83,7 +83,6 @@
<newline/>
<label align="0.0" string="This wizard will automatically configure the web client for Business Intelligence." width="200" colspan="2"/>
</group>
- <!--separator string="" orientation="vertical" colspan="1" rowspan="12"/-->
<group colspan="4">
<separator string=" Business Intelligence Web Client" colspan="4"/>
<field name="host_name" colspan="4"/>
@@ -99,21 +98,9 @@
</group>
</group>
</form>
- <!--form string="Parameters Configure">
- <separator string="BI Web Client." colspan="4"/>
- <label string="This wizard will automatically configure the web client for BI." align="0.0" colspan="4"/>
- <field name="host_name" colspan="4"/>
- <field name="host_port" colspan="4"/>
- <separator string="" colspan="4"/>
- <label string="" colspan="2"/>
- <group col="4" colspan="2">
- <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
- <button name="action_config" string="Configure" icon='gtk-ok' type="object"/>
- </group>
- </form-->
</field>
</record>
-
+
<record id="action_config_bi_parameters" model="ir.actions.act_window">
<field name="name">Parameters Configuration</field>
<field name="type">ir.actions.act_window</field>
@@ -122,7 +109,7 @@
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
-
+
<menuitem
name="Server Parameters"
action="action_config_bi_parameters"
@@ -130,16 +117,16 @@
sequence="50"
parent="base.next_id_50"
/>
-
+
<record model="ir.actions.todo" id="config_auto_directory">
<field name="name">Server Parameters Configuration</field>
<field name="note">This wizard will configure the URL of the web client</field>
<field name="action_id" ref="action_config_bi_parameters"/>
</record>
-
-
+
+
<!-- Wizard view for the Auto Configuring the data -->
-
+
<record id="bi_auto_configure_form" model="ir.ui.view">
<field name="name">bi.auto.configure.form</field>
<field name="model">bi.auto.configure.wizard</field>
@@ -154,7 +141,7 @@
</form>
</field>
</record>
-
+
<record id="act_bi_auto_configure" model="ir.actions.act_window">
<field name="name">Auto Configuration</field>
<field name="res_model">bi.auto.configure.wizard</field>
@@ -165,13 +152,13 @@
<field name="auto_refresh" eval="1"/>
<field name="target">new</field>
</record>
-
-
-
+
+
+
# ------------------------------------------------------------------
# Olap Schema
# ------------------------------------------------------------------
-
+
<record model="ir.ui.view" id="view_olap_schema_tree">
<field name="name">olap.schema.tree</field>
<field name="model">olap.schema</field>
@@ -183,7 +170,7 @@
</tree>
</field>
</record>
-
+
<record model="ir.ui.view" id="view_olap_schema_form">
<field name="name">olap.schema.form</field>
<field name="model">olap.schema</field>
@@ -218,19 +205,19 @@
</form>
</field>
</record>
-
+
<record model="ir.actions.act_window" id="action_olap_schema_form">
<field name="name">Olap Schemas</field>
<field name="res_model">olap.schema</field>
<field name="view_type">form</field>
</record>
-
+
<menuitem
name="Olap Schema"
action="action_olap_schema_form"
id="menu_action_olap_schema_form"
parent="menu_bi_conf_cubes"/>
-
+
# ------------------------------------------------------------------
# Olap Cubes Table
# ------------------------------------------------------------------
@@ -268,23 +255,23 @@
</form>
</field>
</record>
-
+
<record model="ir.actions.act_window" id="action_olap_cube_table_form">
<field name="name">Olap Cube Tables</field>
<field name="res_model">olap.cube.table</field>
<field name="view_type">form</field>
</record>
-
+
<menuitem
name="Olap Cubes Table"
parent = "menu_bi_conf_cubes"
action="action_olap_cube_table_form"
id="menu_action_olap_cube_table_form"/>
-
+
# ------------------------------------------------------------------
# Olap Cubes
# ------------------------------------------------------------------
-
+
<record model="ir.ui.view" id="view_olap_cube_tree">
<field name="name">olap.cube.tree</field>
<field name="model">olap.cube</field>
@@ -296,7 +283,7 @@
</tree>
</field>
</record>
-
+
<record model="ir.ui.view" id="view_olap_cube_form">
<field name="name">olap.cube.form</field>
<field name="model">olap.cube</field>
@@ -310,24 +297,24 @@
</form>
</field>
</record>
-
+
<record model="ir.actions.act_window" id="action_olap_cube_form">
<field name="name">Olap Cubes</field>
<field name="res_model">olap.cube</field>
<field name="view_type">form</field>
</record>
-
+
<menuitem
name="Olap Cubes"
parent ="menu_bi_conf_cubes"
action="action_olap_cube_form"
id="menu_action_olap_cube_form"/>
-
-
+
+
# ------------------------------------------------------------------
# Olap Dimensions
# ------------------------------------------------------------------
-
+
<record model="ir.ui.view" id="view_olap_dimension_tree">
<field name="name">olap.dimension.tree</field>
<field name="model">olap.dimension</field>
@@ -339,7 +326,7 @@
</tree>
</field>
</record>
-
+
<record model="ir.ui.view" id="view_olap_dimension_form">
<field name="name">olap.dimension.form</field>
<field name="model">olap.dimension</field>
@@ -351,23 +338,23 @@
</form>
</field>
</record>
-
+
<record model="ir.actions.act_window" id="action_olap_dimension_form">
<field name="name">Olap Dimensions</field>
<field name="res_model">olap.dimension</field>
<field name="view_type">form</field>
</record>
-
+
<menuitem
name="Olap Dimension"
parent = "menu_bi_conf_cubes"
action="action_olap_dimension_form"
id="menu_action_olap_dimension_form"/>
-
+
# ------------------------------------------------------------------
# Olap Hierarchies
# ------------------------------------------------------------------
-
+
<record model="ir.ui.view" id="view_olap_hierarchy_tree">
<field name="name">olap.hierarchy.tree</field>
<field name="model">olap.hierarchy</field>
@@ -379,7 +366,7 @@
</tree>
</field>
</record>
-
+
<record model="ir.ui.view" id="view_olap_hierarchy_form">
<field name="name">olap.hierarchy.form</field>
<field name="model">olap.hierarchy</field>
@@ -389,32 +376,28 @@
<field name="name" select="1" colspan="2"/>
<field name="sequence" colspan="2"/>
<field name="dimension_id" select="1" attrs="{'readonly':[('dimension_id','!=','')]}" colspan="4"/>
- <!-- <field name="field_name" select="2"/>-->
-
<field name="table_id" select="2" colspan="4" context="{'d_id':dimension_id}"/>
- <!-- <separator string="Levels" colspan="4"/>
- <field name="level_ids" colspan="4" nolabel="1"/>-->
</form>
</field>
</record>
-
+
<record model="ir.actions.act_window" id="action_olap_hierarchy_form">
<field name="name">Olap Hierarchies</field>
<field name="res_model">olap.hierarchy</field>
<field name="view_type">form</field>
</record>
-
+
<menuitem
name="Olap Hierarchy"
parent = "menu_bi_conf_cubes"
action="action_olap_hierarchy_form"
id="menu_action_olap_hierarchy_form"/>
-
-
+
+
# ------------------------------------------------------------------
# Olap Levels
# ------------------------------------------------------------------
-
+
<record model="ir.ui.view" id="view_olap_level_tree">
<field name="name">olap.level.tree</field>
<field name="model">olap.level</field>
@@ -431,7 +414,7 @@
</tree>
</field>
</record>
-
+
<record model="ir.ui.view" id="view_olap_level_form">
<field name="name">olap.level.form</field>
<field name="model">olap.level</field>
@@ -450,24 +433,24 @@
</form>
</field>
</record>
-
+
<record model="ir.actions.act_window" id="action_olap_level_form">
<field name="name">Olap Level</field>
<field name="res_model">olap.level</field>
<field name="view_type">form</field>
</record>
-
+
<menuitem
name="Olap Level"
parent = "menu_bi_conf_cubes"
action="action_olap_level_form"
id="menu_action_olap_level_form"/>
-
-
+
+
# ------------------------------------------------------------------
# Olap Measure
# ------------------------------------------------------------------
-
+
<record model="ir.ui.view" id="view_olap_measure_tree">
<field name="name">olap.measure.tree</field>
<field name="model">olap.measure</field>
@@ -479,7 +462,7 @@
</tree>
</field>
</record>
-
+
<record model="ir.ui.view" id="view_olap_measure_form">
<field name="name">olap.measure.form</field>
<field name="model">olap.measure</field>
@@ -507,19 +490,19 @@
</form>
</field>
</record>
-
+
<record model="ir.actions.act_window" id="action_olap_measure_form">
<field name="name">Olap Measures</field>
<field name="res_model">olap.measure</field>
<field name="view_type">form</field>
</record>
-
+
<menuitem
name="Olap Measures"
parent = "menu_bi_conf_cubes"
action="action_olap_measure_form"
id="menu_action_olap_measure_form"/>
-
+
# ------------------------------------------------------------------
# Olap Saved Query
# ------------------------------------------------------------------
@@ -538,7 +521,7 @@
</tree>
</field>
</record>
-
+
<record model="ir.ui.view" id="view_olap_saved_query_form_mdx">
<field name="name">olap.saved.query.mdx</field>
<field name="model">olap.saved.query</field>
@@ -554,7 +537,7 @@
</tree>
</field>
</record>
-
+
<record model="ir.ui.view" id="view_olap_saved_query_form">
<field name="name">olap.saved.query.form</field>
<field name="model">olap.saved.query</field>
@@ -576,22 +559,22 @@
</form>
</field>
</record>
-
+
<record model="ir.actions.act_window" id="action_olap_saved_query_form">
<field name="name">Olap Saved Query</field>
<field name="res_model">olap.saved.query</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,mdx</field>
</record>
-
+
<menuitem
name="Olap Saved Query"
parent = "menu_bi_conf_tools"
action="action_olap_saved_query_form"
id="menu_action_olap_saved_query_form"/>
-
+
<!-- All Logs -->
-
+
<record model="ir.ui.view" id="view_olap_query_logs_tree">
<field name="name">olap.query.logs</field>
<field name="model">olap.query.logs</field>
@@ -605,7 +588,7 @@
</tree>
</field>
</record>
-
+
<record model="ir.ui.view" id="view_olap_query_logs_form">
<field name="name">olap.query.logs.form</field>
<field name="model">olap.query.logs</field>
@@ -622,21 +605,21 @@
</form>
</field>
</record>
-
+
<record model="ir.actions.act_window" id="action_olap_query_logs_form">
<field name="name">All Logs</field>
<field name="res_model">olap.query.logs</field>
<field name="view_type">form</field>
</record>
-
+
<menuitem
name="All Logs"
action="action_olap_query_logs_form"
id="menu_action_olap_query_logs_form"
parent="menu_bi_conf_tools"/>
-
+
<!-- All Logs / My logs -->
-
+
<record model="ir.ui.view" id="view_olap_query_logs_my_tree">
<field name="name">olap.query.logs</field>
<field name="model">olap.query.logs</field>
@@ -649,7 +632,7 @@
</tree>
</field>
</record>
-
+
<record model="ir.ui.view" id="view_olap_query_logs_my_tree">
<field name="name">olap.query.logs</field>
<field name="model">olap.query.logs</field>
@@ -662,9 +645,9 @@
</tree>
</field>
</record>
-
+
<!-- Query Logs -->
-
+
<record model="ir.ui.view" id="view_olap_query_logs_my_form">
<field name="name">olap.query.logs.form</field>
<field name="model">olap.query.logs</field>
@@ -680,7 +663,7 @@
</form>
</field>
</record>
-
+
<record model="ir.actions.act_window" id="action_olap_query_logs_my_form">
<field name="name">My Logs</field>
<field name="res_model">olap.query.logs</field>
@@ -688,12 +671,12 @@
<field name="view_mode">tree,form,mdx</field>
<field name="domain">[('user_id','=',uid)]</field>
</record>
-
+
<menuitem
name="My Logs"
action="action_olap_query_logs_my_form"
id="menu_action_olap_query_logs_my_form"
parent="menu_action_olap_query_logs_form"/>
-
+
</data>
</openerp>
=== modified file 'olap/data/olap_cube_workflow.xml'
--- olap/data/olap_cube_workflow.xml 2010-04-29 08:01:54 +0000
+++ olap/data/olap_cube_workflow.xml 2010-08-13 13:36:19 +0000
@@ -6,52 +6,42 @@
<field name="osv">olap.schema</field>
<field name="on_create">True</field>
</record>
-
+
<record model="workflow.activity" id="act_none">
<field name="wkf_id" ref="wkf_schema"/>
<field name="flow_start">True</field>
<field name="name">none</field>
</record>
-
+
<record model="workflow.activity" id="act_dbconnect">
<field name="wkf_id" ref="wkf_schema"/>
<field name="name">dbconnect</field>
<field name="kind">function</field>
<field name="action">action_dbconnect()</field>
</record>
-
+
<record model="workflow.activity" id="act_dbload">
<field name="wkf_id" ref="wkf_schema"/>
<field name="name">dbload</field>
<field name="kind">function</field>
<field name="action">action_dbload()</field>
</record>
-
+
<record model="workflow.activity" id="act_dbconfigure">
<field name="wkf_id" ref="wkf_schema"/>
<field name="name">dbconfigure</field>
<field name="kind">function</field>
<field name="action">action_dbconfigure()</field>
</record>
-
+
<record model="workflow.activity" id="act_dbready">
<field name="wkf_id" ref="wkf_schema"/>
<field name="flow_stop">True</field>
<field name="name">dbready</field>
<field name="kind">function</field>
- <field name="action">action_dbready()</field>
- </record>
-<!--
- <record model="workflow.activity" id="act_dbdone">
- <field name="wkf_id" ref="wkf_schema"/>
- <field name="flow_stop">True</field>
- <field name="name">db_done</field>
- <field name="kind">function</field>
- <field name="action">action_done()</field>
- </record>
--->
+ <field name="action">action_dbready()</field>
+ </record>
-
<record model="workflow.transition" id="trans_none_dbconnect">
<field name="act_from" ref="act_none"/>
<field name="act_to" ref="act_dbconnect"/>
@@ -69,19 +59,12 @@
<field name="act_to" ref="act_dbconfigure"/>
<field name="signal">dbconfigure</field>
</record>
-
+
<record model="workflow.transition" id="trans_dbconfigure_dbready">
<field name="act_from" ref="act_dbconfigure"/>
<field name="act_to" ref="act_dbready"/>
<field name="signal">dbready</field>
</record>
-<!--
- <record model="workflow.transition" id="trans_dbready_done">
- <field name="act_from" ref="act_dbready"/>
- <field name="act_to" ref="act_dbdone"/>
- <field name="signal">dbdone</field>
- </record>
--->
</data>
</openerp>
=== modified file 'olap/data/olap_fact_view.xml'
--- olap/data/olap_fact_view.xml 2010-04-29 08:01:54 +0000
+++ olap/data/olap_fact_view.xml 2010-08-13 13:36:19 +0000
@@ -77,8 +77,6 @@
<field name="fact_database_id" select="2"/>
<field name="active"/>
<field name="hide"/>
-<!-- <button name="show_col_view" string="Columns" type="object"/>-->
-
<button name="hide_col" string="Hide" type="object"/>
<button name="show_col" string="Show" type="object"/>
</tree>
=== modified file 'olap/data/olap_wizard.xml'
--- olap/data/olap_wizard.xml 2010-05-26 08:28:37 +0000
+++ olap/data/olap_wizard.xml 2010-08-13 13:36:19 +0000
@@ -3,53 +3,42 @@
<data>
<wizard
- string="Query Builder"
- model="olap.schema"
- name="olap.query_builder"
- menu= "False"
- multi="True"
- id="bi_conf_cube_query_builder"/>
-
-
- <!-- <wizard
- string="Load Tables"
- model="olap.schema"
- name="olap.load.table"
- menu= "False"
- multi="True"
- id="bi_menu_olap_load_table"/>-->
-
-
- <wizard
- string="Load Tables"
- model="olap.schema"
- name="olap.load.table"
- menu= "False"
- multi="True"
- id="bi_menu_olap_load_table"/>
-
- <wizard
- string="Open Configuration"
- model="olap.schema"
- name="olap.load.configuration.table"
- menu= "False"
- multi="True"
- id="bi_load_configuration_table"/>
-
- <wizard
- string="Configure from Application"
- model="olap.schema"
- name="olap.application.configuration"
- multi="True"
- id="bi_application_configuration"/>
-
- <wizard
- string="Test Connection"
- model="olap.fact.database"
- name="olap.fact.database.test_connection"
- menu="False"
- id="bi_test_connection"/>
-
+ string="Query Builder"
+ model="olap.schema"
+ name="olap.query_builder"
+ menu= "False"
+ multi="True"
+ id="bi_conf_cube_query_builder"/>
+
+ <wizard
+ string="Load Tables"
+ model="olap.schema"
+ name="olap.load.table"
+ menu= "False"
+ multi="True"
+ id="bi_menu_olap_load_table"/>
+
+ <wizard
+ string="Open Configuration"
+ model="olap.schema"
+ name="olap.load.configuration.table"
+ menu= "False"
+ multi="True"
+ id="bi_load_configuration_table"/>
+
+ <wizard
+ string="Configure from Application"
+ model="olap.schema"
+ name="olap.application.configuration"
+ multi="True"
+ id="bi_application_configuration"/>
+
+ <wizard
+ string="Test Connection"
+ model="olap.fact.database"
+ name="olap.fact.database.test_connection"
+ menu="False"
+ id="bi_test_connection"/>
</data>
</openerp>
=== modified file 'olap/olap.py'
--- olap/olap.py 2010-07-28 11:43:44 +0000
+++ olap/olap.py 2010-08-13 13:36:19 +0000
@@ -203,7 +203,7 @@
'state': lambda * a: 'none',
'configure': lambda * a: False,
'ready': lambda * a: False
- }
+ }
def action_dbconnect(self, cr, uid, ids, context = {}):
""" Connect DB with postgres ,Or MySql,Or Orcale
@@ -497,7 +497,7 @@
'text': 'Text',
'date': 'Date',
'time': 'TimeStamp without Time Zone',
- 'number': 'NUMBER',
+ 'number': 'NUMBER',
}
def _datatypes_get(self, *args, **argv):
@@ -718,9 +718,9 @@
if context['parent_id']:
parent_id = context['parent_id']
val = {
- 'cube_table_id': parent_id,
- 'table_id': table_id,
- 'field_id': ids[0]
+ 'cube_table_id': parent_id,
+ 'table_id': table_id,
+ 'field_id': ids[0]
}
id = self.pool.get('olap.cube.table.line').create(cr, uid, val, context)
@@ -993,7 +993,7 @@
relation = 'olap.database.columns',
string = 'Available Tables',
type = "many2many"
- ),
+ ),
}
_defaults = {
@@ -1070,8 +1070,8 @@
}
_defaults = {
- 'schema_id': _set_schema
- }
+ 'schema_id': _set_schema
+ }
olap_cube()
@@ -1091,8 +1091,8 @@
}
_defaults = {
- 'count':lambda * args: 0
- }
+ 'count':lambda * args: 0
+ }
olap_query_logs()
@@ -1120,7 +1120,7 @@
'hierarchy_ids': fields.one2many('olap.hierarchy', 'dimension_id', 'Hierarchies'),
}
_defaults = {
- 'cube_id': _set_cube,
+ 'cube_id': _set_cube,
}
olap_dimension()
@@ -1414,15 +1414,15 @@
_decription = "Olap Saved Query"
_columns = {
- 'name': fields.text('Query Name', size = 64),
- 'user_id': fields.many2one('res.users', 'User'),
- 'query': fields.text('Query', required = True),
- 'cube_id': fields.many2one('olap.cube', 'Cube', required = True),
- 'mdx_id': fields.char('Module', size=64),
- 'schema_id': fields.many2one('olap.schema', 'Schema', required = True),
- 'time': fields.datetime('Time', required = True),
- 'axis_keys': fields.text('Axis Keys'),
- }
+ 'name': fields.text('Query Name', size = 64),
+ 'user_id': fields.many2one('res.users', 'User'),
+ 'query': fields.text('Query', required = True),
+ 'cube_id': fields.many2one('olap.cube', 'Cube', required = True),
+ 'mdx_id': fields.char('Module', size=64),
+ 'schema_id': fields.many2one('olap.schema', 'Schema', required = True),
+ 'time': fields.datetime('Time', required = True),
+ 'axis_keys': fields.text('Axis Keys'),
+ }
olap_saved_query()
# Wizard for the Load Data Structure
@@ -1865,11 +1865,11 @@
_columns = {
'name': fields.char('Fact Name' , size = 64, readonly = True),
- }
+ }
_defaults = {
- 'name': _get_name,
- }
+ 'name': _get_name,
+ }
def action_load(self, cr, uid, ids, context = None):
"""
@@ -2078,12 +2078,12 @@
return {'type': 'ir.actions.act_window_close' }
_columns = {
- 'query': fields.text('Query', readonly=True),
- }
+ 'query': fields.text('Query', readonly=True),
+ }
_defaults = {
'query': _get_queries,
- }
+ }
olap_warehouse_wizard()
@@ -2152,14 +2152,14 @@
its not clear.", required = True),
'config_logo': fields.binary('Image', readonly=True),
'progress': fields.float('Configuration Progress', readonly=True),
- }
+ }
_defaults = {
'host_name': _get_host,
'host_port': _get_port,
'progress': _progress,
'config_logo': _get_image,
- }
+ }
def action_cancel(self, cr, uid, ids, conect = None):
"""
@@ -2171,11 +2171,11 @@
"""
return {
- 'view_type': 'form',
- "view_mode": 'form',
- 'res_model': 'ir.actions.configuration.wizard',
- 'type': 'ir.actions.act_window',
- 'target':'new',
+ 'view_type': 'form',
+ "view_mode": 'form',
+ 'res_model': 'ir.actions.configuration.wizard',
+ 'type': 'ir.actions.act_window',
+ 'target':'new',
}
def action_config(self, cr, uid, ids, context = None):
@@ -2203,11 +2203,11 @@
':' + (conf.host_port or '8080') + '/designer'})
return {
- 'view_type': 'form',
- "view_mode": 'form',
- 'res_model': 'ir.actions.configuration.wizard',
- 'type': 'ir.actions.act_window',
- 'target':'new',
+ 'view_type': 'form',
+ "view_mode": 'form',
+ 'res_model': 'ir.actions.configuration.wizard',
+ 'type': 'ir.actions.act_window',
+ 'target':'new',
}
olap_parameters_config_wizard()
=== modified file 'olap/wizard/olap_query_logs_clear.py'
--- olap/wizard/olap_query_logs_clear.py 2010-04-06 04:25:02 +0000
+++ olap/wizard/olap_query_logs_clear.py 2010-08-13 13:36:19 +0000
@@ -26,7 +26,7 @@
_description = "Olap Query Logs Clear"
_columns = {
- 'user_name':fields.char('User', size=64, required=True, readonly=True),
+ 'user_name':fields.char('User', size=64, required=True, readonly=True),
}
def _getdata(self, cr, uid, context={}):
@@ -35,7 +35,7 @@
_defaults = {
'user_name': _getdata
- }
+ }
def clear_logs(self, cr, uid, part, context={}):
"""
@@ -52,11 +52,11 @@
if id2:
id2 = data_obj.browse(cr, uid, id2, context=context).res_id
value = {
- 'view_type': 'form',
- 'view_mode': 'form',
- 'res_model': 'olap.query.logs.clear.msg',
- 'views': [(id2, 'form'), (False, 'tree'), (False, 'calendar'), (False, 'graph')],
- 'type': 'ir.actions.act_window',
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'olap.query.logs.clear.msg',
+ 'views': [(id2, 'form'), (False, 'tree'), (False, 'calendar'), (False, 'graph')],
+ 'type': 'ir.actions.act_window',
'target': 'new'
}
return value
=== modified file 'olap/wizard/wizard_load_configured_table.py'
--- olap/wizard/wizard_load_configured_table.py 2010-04-29 08:01:54 +0000
+++ olap/wizard/wizard_load_configured_table.py 2010-08-13 13:36:19 +0000
@@ -33,20 +33,14 @@
class wizard_load_configured_table(wizard.interface):
def _get_table_data(self, cr, uid, data, context={}):
pool_obj = pooler.get_pool(cr.dbname)
-
-# vals={}
-# vals['configure']=True
-# vals['state']='dbconfigure'
-# pooler.get_pool(cr.dbname).get('olap.schema').write(cr,uid,data['id'],vals)
-
wf_service = netsvc.LocalService('workflow')
wf_service.trg_validate(uid, 'olap.schema', data['id'], 'dbconfigure', cr)
-
+
lines=pool_obj.get('olap.schema').read(cr, uid, data['id'],context={})
fact_ids=pool_obj.get('olap.database.tables').search(cr, uid, ([('fact_database_id','=',lines['database_id'][0])]),context={})
model_data_ids = pool_obj.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_olap_database_tables_form')],context={})
resource_id = pool_obj.get('ir.model.data').read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
-
+
return {
'domain': "[('id','in', ["+','.join(map(str,fact_ids))+"])]",
'name': 'Database Tables',
@@ -56,7 +50,7 @@
'views': [(False,'tree'),(resource_id,'form')],
'type': 'ir.actions.act_window'
}
-
+
states = {
'init' : {
'actions' : [],
=== modified file 'olap/wizard/wizard_load_data.py'
--- olap/wizard/wizard_load_data.py 2010-06-16 11:51:39 +0000
+++ olap/wizard/wizard_load_data.py 2010-08-13 13:36:19 +0000
@@ -101,7 +101,7 @@
WHERE table_schema = 'public'""")
for col in cr_db.fetchall():
- val={
+ val = {
'table_id': tables[col[0]],
'column_db_name': col[1],
'type': col[2],
@@ -126,7 +126,7 @@
constraint_type = 'PRIMARY KEY')""")
print "Updating the Primary Key Constraint"
for constraint in cr_db.fetchall():
- val={
+ val = {
'primary_key':True
}
@@ -155,7 +155,7 @@
constraint_type = 'FOREIGN KEY')""")
for constraint in cr_db.fetchall():
- val={
+ val = {
'related_to':tables[for_key[constraint[2]]]
}
id_to_write=filter(lambda x:(int(cols[x][1])==int(tables[constraint[0]])and (constraint[1]==cols[x][0])),cols)
@@ -209,7 +209,7 @@
for col in cr_db.fetchall():
- val={
+ val = {
'table_id': tables[col[0]],
'column_db_name': col[1],
'type': col[2],
@@ -237,14 +237,14 @@
for constraint in cr_db.fetchall():
if constraint[0]:
- val={
- 'related_to':tables[constraint[1]]
- }
+ val = {
+ 'related_to':tables[constraint[1]]
+ }
else:
- val={
- 'primary_key':True
- }
+ val = {
+ 'primary_key':True
+ }
id_to_write=filter(lambda x:(int(cols[x][1])==int(tables[constraint[3]])and(constraint[2]==cols[x][0])),cols)
col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context)
@@ -304,7 +304,7 @@
type_col='varchar'
else:
type_col=col[2]
- val={
+ val = {
'table_id': tables[col[0]],
'column_db_name': col[1],
'type': type_col,
@@ -331,7 +331,7 @@
temp = cr_db.fetchall()
pk_table = {}
for constraint in temp:
- val={
+ val = {
'primary_key' : True
}
pk_table[constraint[2]] = constraint[0]
@@ -364,7 +364,7 @@
for constraint in temp:
rel_constraint_name=constraints_map[constraint[2]]
req_table = pk_table[rel_constraint_name]
- val={
+ val = {
'related_to' : tables[req_table]
}
id_to_write=filter(lambda x:(int(cols[x][1])==int(tables[constraint[0]])and (constraint[1]==cols[x][0])),cols)
=== modified file 'olap/wizard/wizard_query_builder.py'
--- olap/wizard/wizard_query_builder.py 2010-05-25 08:06:45 +0000
+++ olap/wizard/wizard_query_builder.py 2010-08-13 13:36:19 +0000
@@ -136,15 +136,13 @@
<field name="mdx_query_output" colspan="4" height="100" width="800"/>
</form>"""
query_builder_fields={
-
-
- 'dimension':{'string':'Dimension','type':'text'},
- 'hierarchy':{'string':'Hiearchy','type':'text'},
- 'level':{'string':'Level','type':'text'},
- 'measure':{'string':'Measure','type':'text'},
- 'mdx_query':{'string':'MDX Query','type':'text'},
- 'mdx_query_output':{'string':'MDX Query Output','type':'text'},
- }
+ 'dimension':{'string':'Dimension','type':'text'},
+ 'hierarchy':{'string':'Hiearchy','type':'text'},
+ 'level':{'string':'Level','type':'text'},
+ 'measure':{'string':'Measure','type':'text'},
+ 'mdx_query':{'string':'MDX Query','type':'text'},
+ 'mdx_query_output':{'string':'MDX Query Output','type':'text'},
+}
query_builder_fetch_form = """<?xml version="1.0"?>
<form string="Cube Fetcher">
@@ -185,10 +183,8 @@
ok = True
if not ok:
continue
- #print ' '*COLSPAN,
output =' '*COLSPAN
log.add(output)
- # print (('%-'+str(ROWSPAN)+'s ' ) * len(axis[1])) % tuple(map(lambda x: str(len(x[0])==i and x[1] or ''),axis[1]))
output=(('%-'+str(ROWSPAN)+'s ' ) * len(axis[1])) % tuple(map(lambda x: str(len(x[0])==i and x[1] or ''),axis[1]))
log.add(output)
@@ -197,23 +193,18 @@
print "--------------------------------------",x
temp=(axis[0].pop(0)[1])
print "--------------------------------------",temp
- # print ('%-'+str(COLSPAN)+'s')% (' '*(len(axis[0][0][0])-1)*2 + (temp),),
output =('%-'+str(COLSPAN)+'s')% (str(x)+str(temp))
log.add("\n")
log.add(output)
- #output=(temp)
for row in col:
if row==[False]:
- # print ('%-'+str(ROWSPAN)+'s')%('',),
output=('%-'+str(ROWSPAN)+'s')%('')
log.add(output)
else:
- # print ('%-'+str(ROWSPAN)+'s')%(row,),
output=('%-'+str(ROWSPAN)+'s')%(row)
log.add(output)
- #print
log.add("\n")
return {'mdx_query_output':log()}
=== modified file 'olap_crm/olap_crm.xml'
--- olap_crm/olap_crm.xml 2010-08-12 14:31:06 +0000
+++ olap_crm/olap_crm.xml 2010-08-13 13:36:19 +0000
@@ -68,10 +68,10 @@
<field name="fact_database_id" ref="fact_databases_BI"/>
<field name="active">True</field>
</record>
-
+
<!-- Olap Database Columns -->
-
+
<record model="olap.database.columns" id="crm_case_id">
<field name="name">id</field>
<field name="column_db_name">id</field>
@@ -95,7 +95,7 @@
<field name="active">True</field>
<field name="related_to" ref="table_res_partner"/>
</record>
-
+
<record model="olap.database.columns" id="crm_case_planned_cost">
<field name="name">id</field>
<field name="column_db_name">id</field>
@@ -144,7 +144,7 @@
<field name="type">int4</field>
<field name="table_id" ref="table_crm_case"/>
<field name="related_to" ref="table_res_partner"/>
- </record>
+ </record>
<record model="olap.database.columns" id="crm_case_canal_id">
<field name="name">canal_id</field>
@@ -265,7 +265,7 @@
DIMENSION Sections
-->
-
+
<record model="olap.dimension" id="dimension_crm_section">
<field name="name">Sections</field>
<field name="cube_id" ref="cube_crm"/>
@@ -378,7 +378,7 @@
</record>
-
+
<record model="olap.dimension" id="dimension_crm_channel">
<field name="name">Channels</field>
<field name="cube_id" ref="cube_crm"/>
@@ -428,7 +428,7 @@
<field name="value_sql">avg(crm_case.planned_cost)</field>
<field name="formatstring">cr_postfix_comma</field>
</record>
-
+
<record model="olap.measure" id="measure_planned_revenue">
<field name="name">Planned Revenue</field>
<field name="cube_id" ref="cube_crm"/>
@@ -438,7 +438,7 @@
<field name="agregator">sum</field>
<field name="formatstring">cr_postfix_comma</field>
</record>
-
+
<record model="olap.measure" id="measure_planned_revenue">
<field name="name">Planned Revenue</field>
<field name="cube_id" ref="cube_crm"/>
@@ -447,7 +447,7 @@
<field name="table_name">crm_case</field>
<field name="agregator">sum</field>
</record>
-
+
<record model="olap.measure" id="measure_probability">
<field name="name">Probability</field>
<field name="cube_id" ref="cube_crm"/>
@@ -456,7 +456,7 @@
<field name="table_name">crm_case</field>
<field name="agregator">sum</field>
</record>
-d
+
</data>
</openerp>
=== modified file 'olap_extract/wizard_olap_extract.py'
--- olap_extract/wizard_olap_extract.py 2010-07-28 11:43:44 +0000
+++ olap_extract/wizard_olap_extract.py 2010-08-13 13:36:19 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -39,15 +39,15 @@
class wizard_olap_extract(wizard.interface):
-
+
def zipper(self,zipname,filename,mode="a"):
z = zipfile.ZipFile(zipname+".zip", mode)
z.write(filename)
print "\n",z.printdir()
-
-
+
+
def write_csv(self,filename,content=[]):
- fid = open(filename, 'w')
+ fid = open(filename, 'w')
if fid == -1:
print 'File: temp.csv not found or could not be opened'
return False
@@ -55,20 +55,20 @@
writer=csv.writer(fid, 'TINY',delimiter=',')
for row in content:
writer.writerow(row)
- fid.close
+ fid.close
return True
-
+
def table_depth(self,cr,uid,list=[],context={}):
res={}
templeft={}
tempright={}
for table_id in list:
- lines=pooler.get_pool(cr.dbname).get('olap.cube.table').browse(cr, uid,table_id,context)
+ lines=pooler.get_pool(cr.dbname).get('olap.cube.table').browse(cr, uid,table_id,context)
res[str(lines.id)] = ["cubetable_"+str(lines.id),lines.name and lines.name or '',lines.table_alias and lines.table_alias or '',lines.key_left and lines.key_left or '',lines.key_right and lines.key_right or '',lines.table_left_id.id and "cubetable_"+str(lines.table_left_id.id) or '',lines.table_right_id.id and "cubetable_"+str(lines.table_right_id.id) or '']
if(lines.table_left_id.id):
templeft = self.table_depth(cr,uid,[lines.table_left_id.id],context)
-
+
if templeft:
for temp in templeft:
if not res.has_key(temp):
@@ -76,24 +76,24 @@
if(lines.table_right_id.id):
- tempright = self.table_depth(cr,uid,[lines.table_right_id.id],context)
-
+ tempright = self.table_depth(cr,uid,[lines.table_right_id.id],context)
+
if tempright:
for temp in tempright:
if not res.has_key(temp):
res[temp]= tempright[temp]
return res
-
-
+
+
def _extract_schema(self, cr, uid, data, context={}):
_name = data['form']['module_name']
_modulename = "olap_"+_name
-
+
dirname = _modulename
if not os.path.isdir("./addons/" + dirname + "/"):
- os.mkdir("./addons/" + dirname + "/")
-
+ os.mkdir("./addons/" + dirname + "/")
+
os.chdir("./addons/"+dirname)
_init = "import %s" % _modulename
@@ -101,17 +101,17 @@
f.write(_init)
f.close()
self.zipper(_modulename, "__init__.py","w")
-
+
_init_files = {
- "1":"olap.fact.database.csv",
- "2":"olap.schema.csv",
- "5":"olap.cube.table.csv",
- "6":"olap.cube.csv",
- "7":"olap.dimension.csv",
- "8":"olap.hierarchy.csv",
- "9":"olap.level.csv",
- "10":"olap.measure.csv"
- }
+ "1":"olap.fact.database.csv",
+ "2":"olap.schema.csv",
+ "5":"olap.cube.table.csv",
+ "6":"olap.cube.csv",
+ "7":"olap.dimension.csv",
+ "8":"olap.hierarchy.csv",
+ "9":"olap.level.csv",
+ "10":"olap.measure.csv"
+ }
_init_xml = """"%(1)s",
"%(2)s",
"%(5)s",
@@ -121,7 +121,7 @@
"%(9)s",
"%(10)s",
""" % _init_files
-
+
data['modulename'] = _modulename
data['init_xml'] = _init_xml
@@ -144,36 +144,36 @@
f = open("__terp__.py","w")
f.write(_terp)
- f.close()
- self.zipper(_modulename, "__terp__.py")
-
+ f.close()
+ self.zipper(_modulename, "__terp__.py")
+
schema_id = data['id']
lines=pooler.get_pool(cr.dbname).get('olap.schema').browse(cr, uid, schema_id,context)
-
+
_extract=[]
_extract.append(['id','name','db_name','db_login','db_password'])
_extract.append(["db_"+str(lines.database_id.id),lines.database_id.name,lines.database_id.db_name,lines.database_id.db_login,lines.database_id.db_password])
self.write_csv('olap.fact.database.csv',_extract)
self.zipper(_modulename, "olap.fact.database.csv")
-
+
_extract=[]
_extract.append(['id','name','database_id:id','loaded','configure','ready','state','note'])
_extract.append(["schema_"+str(lines.id),lines.name,"db_"+str(lines.database_id.id),lines.loaded and lines.loaded or '',lines.configure and lines.configure or '', lines.ready and lines.ready or '',lines.state,lines.note and lines.note or ''])
self.write_csv('olap.schema.csv',_extract)
- self.zipper(_modulename, "olap.schema.csv")
-
+ self.zipper(_modulename, "olap.schema.csv")
+
cube_ids = lines.cube_ids
_extractcubes=[]
_extractcubes.append(['id','name','table_id:id','schema_id:id'])
-
+
_extractmeasures=[]
- _extractmeasures.append(['id','name','cube_id:id','value_column','value_sql','agregator','datatype','formatstring'])
-
+ _extractmeasures.append(['id','name','cube_id:id','value_column','value_sql','agregator','datatype','formatstring'])
+
_extractdimension=[]
_extractdimension.append(['id','name','foreign_key','foreign_key_table','cube_id:id'])
-
+
_extracthiers=[]
_extracthiers.append(['id','name','primary_key','primary_key_table','field_name','member_all','member_default','sequence','type','dimension_id:id','table_id:id'])
@@ -182,26 +182,26 @@
_cube_table_ids = []
for cube in cube_ids:
- _extractcubes.append(["cube_"+str(cube.id),cube.name,"cubetable_"+str(cube.table_id.id),"schema_"+str(cube.schema_id.id)])
- _cube_table_ids.append(cube.table_id.id)
-
+ _extractcubes.append(["cube_"+str(cube.id),cube.name,"cubetable_"+str(cube.table_id.id),"schema_"+str(cube.schema_id.id)])
+ _cube_table_ids.append(cube.table_id.id)
+
measure_ids = cube.measure_ids
for measure in measure_ids:
- _extractmeasures.append(["msr_"+str(measure.id),measure.name,"cube_"+str(measure.cube_id.id),measure.value_column and measure.value_column or '',measure.value_sql and measure.value_sql or '',measure.agregator,measure.datatype and measure.datatype or '',measure.formatstring])
-
+ _extractmeasures.append(["msr_"+str(measure.id),measure.name,"cube_"+str(measure.cube_id.id),measure.value_column and measure.value_column or '',measure.value_sql and measure.value_sql or '',measure.agregator,measure.datatype and measure.datatype or '',measure.formatstring])
+
dimension_ids = cube.dimension_ids
for dimension in dimension_ids:
_extractdimension.append(["dim_"+str(dimension.id),dimension.name,dimension.foreign_key and dimension.foreign_key or '',dimension.foreign_key_table and dimension.foreign_key_table or '',"cube_"+str(dimension.cube_id.id)])
-
+
hiers_ids = dimension.hierarchy_ids
for hier in hiers_ids:
_extracthiers.append(["hier_"+str(hier.id),hier.name,hier.primary_key,hier.primary_key_table and hier.primary_key_table or '',hier.field_name,hier.member_all,hier.member_default,hier.sequence,hier.type,"dim_"+str(hier.dimension_id.id),"cubetable_"+str(hier.table_id.id)])
_cube_table_ids.append(hier.table_id.id)
-
+
level_ids = hier.level_ids
for level in level_ids:
_extractlevels.append(["lvl_"+str(level.id),level.name,level.column_name,level.column_id_name,level.type,level.table_name,level.sequence,"hier_"+str(level.hierarchy_id.id)])
-
+
res={}
_extract=[]
_extract.append(['id','name','table_alias','key_left','key_right','table_left_id:id','table_right_id:id'])
@@ -209,37 +209,37 @@
key = res.keys()
key = map(lambda x: int(x),key)
key.sort()
-
+
for k in key:
_extract.append(res[str(k)])
-
+
self.write_csv('olap.cube.csv',_extractcubes)
self.zipper(_modulename, "olap.cube.csv")
-
+
self.write_csv('olap.measure.csv',_extractmeasures)
- self.zipper(_modulename, "olap.measure.csv")
-
+ self.zipper(_modulename, "olap.measure.csv")
+
self.write_csv('olap.dimension.csv',_extractdimension)
self.zipper(_modulename, "olap.dimension.csv")
-
+
self.write_csv('olap.hierarchy.csv',_extracthiers)
- self.zipper(_modulename, "olap.hierarchy.csv")
-
+ self.zipper(_modulename, "olap.hierarchy.csv")
+
self.write_csv('olap.level.csv',_extractlevels)
- self.zipper(_modulename, "olap.level.csv")
+ self.zipper(_modulename, "olap.level.csv")
self.write_csv('olap.cube.table.csv',_extract)
- self.zipper(_modulename, "olap.cube.table.csv")
+ self.zipper(_modulename, "olap.cube.table.csv")
return {}
-
+
states = {
-
+
'init': {
'actions': [],
'result': {'type':'form','arch':form1, 'fields':field1, 'state':[('end','Cancel'),('ok','OK')]}
- },
-
+ },
+
'ok' : {
'actions' : [],
'result' : {'type' : 'action' ,'action':_extract_schema,'state':'end'}
=== modified file 'olap_sale/olap_sale.xml'
--- olap_sale/olap_sale.xml 2010-06-25 16:07:45 +0000
+++ olap_sale/olap_sale.xml 2010-08-13 13:36:19 +0000
@@ -65,7 +65,7 @@
<field name="table_db_name">res_partner_address</field>
<field name="fact_database_id" ref="fact_databases_BI"/>
<field name="active">True</field>
- </record>
+ </record>
<record model="olap.database.tables" id="table_res_country">
<field name="name">res_country</field>
@@ -87,7 +87,7 @@
<field name="fact_database_id" ref="fact_databases_BI"/>
<field name="active">True</field>
- </record>
+ </record>
<record model="olap.database.columns" id="columns_product_id_sale_order_line">
<field name="name">product_id</field>
<field name="column_db_name">product_id</field>
@@ -105,15 +105,7 @@
<field name="primary_key">True</field>
<field name="active">True</field>
</record>
-<!-- <record model="olap.database.columns" id="columns_sale_order_line_product_id">
- <field name="name">product_id</field>
- <field name="column_db_name">id</field>
- <field name="type">int4</field>
- <field name="table_id" ref="table_sale_order_line"/>
- <field name="active">True</field>
- <field name="related_to" ref="table_product_product"/>
- </record>
--->
+
<record model="olap.database.columns" id="columns_product_template_id">
<field name="name">id</field>
<field name="column_db_name">id</field>
@@ -265,16 +257,6 @@
<field name="active">True</field>
</record>
-<!-- <record model="olap.database.columns" id="columns_sale_order_line_product_id">
-<field name="name">product_id</field>
-<field name="column_db_name">product_id</field>
-<field name="type">int4</field>
-<field name="table_id" ref="table_sale_order_line"/>
-<field name="related_to" ref="table_product_product"/>
-<field name="active">True</field>
-
-</record>
--->
<record model="olap.database.columns" id="columns_sale_order_line_order_id">
<field name="name">order_id</field>
<field name="column_db_name">order_id</field>
@@ -360,7 +342,7 @@
<field name="type">varchar</field>
<field name="table_id" ref="table_res_country"/>
<field name="active">True</field>
- </record>
+ </record>
<record model="olap.database.columns" id="columns_res_partner_address_country_id">
<field name="name">country_id</field>
@@ -369,7 +351,7 @@
<field name="table_id" ref="table_res_partner_address"/>
<field name="related_to" ref="table_res_country"/>
<field name="active">True</field>
- </record>
+ </record>
<record model="olap.database.columns" id="columns_res_partner_address_city">
<field name="name">city</field>
@@ -388,16 +370,6 @@
<field name="active">True</field>
</record>
-<!-- <record model="olap.database.columns" id="columns_sale_order_line_product_id">
-<field name="name">product_id</field>
-<field name="column_db_name">product_id</field>
-<field name="type">int4</field>
-<field name="table_id" ref="table_sale_order_line"/>
-<field name="related_to" ref="table_product_product"/>
-<field name="active">True</field>
-
-</record>
--->
<record model="olap.database.columns" id="columns_sale_order_line_product_uom_qty">
<field name="name">product_uom_qty</field>
<field name="column_db_name">product_uom_qty</field>
@@ -425,7 +397,7 @@
<!--
-Making of the olap.cube.table and olap.cube.table.lines
+Making of the olap.cube.table and olap.cube.table.lines
-->
<record model="olap.cube.table" id="cube_table_sale_order_line">
=== modified file 'partner_geo_assign/__openerp__.py'
--- partner_geo_assign/__openerp__.py 2010-07-26 15:51:44 +0000
+++ partner_geo_assign/__openerp__.py 2010-08-13 13:36:19 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -33,7 +33,7 @@
'data': [
'res_partner_view.xml',
'crm_lead_view.xml',
- ],
+ ],
'installable': True,
'active': False,
'certificate': False,
=== modified file 'point_of_sale/__openerp__.py'
--- point_of_sale/__openerp__.py 2010-08-09 11:14:53 +0000
+++ point_of_sale/__openerp__.py 2010-08-13 13:36:19 +0000
@@ -41,29 +41,28 @@
'update_xml': [
'security/point_of_sale_security.xml',
'security/ir.model.access.csv',
- 'wizard/pos_details.xml',
+ 'wizard/pos_details.xml',
'wizard/pos_add_product.xml',
'wizard/pos_confirm.xml',
'wizard/pos_discount.xml',
'wizard/pos_get_sale.xml',
'wizard/pos_open_statement.xml',
- 'wizard/pos_close_statement.xml',
+ 'wizard/pos_close_statement.xml',
'wizard/pos_box_entries.xml',
'wizard/pos_payment_report_user_view.xml',
'wizard/pos_payment_report_date_view.xml',
- 'wizard/pos_box_out.xml',
+ 'wizard/pos_box_out.xml',
'wizard/pos_sales_user.xml',
- 'wizard/all_closed_cashbox_of_the_day.xml',
+ 'wizard/all_closed_cashbox_of_the_day.xml',
'wizard/pos_sales_user_current_user.xml',
- 'wizard/pos_sale_user_today.xml',
- 'wizard/pos_receipt_view.xml',
- 'wizard/pos_payment_report_user.xml',
+ 'wizard/pos_sale_user_today.xml',
+ 'wizard/pos_receipt_view.xml',
+ 'wizard/pos_payment_report_user.xml',
'wizard/pos_payment_report.xml',
'wizard/pos_payment.xml',
'wizard/pos_scan_product_view.xml',
'wizard/pos_return_view.xml',
'pos_report.xml',
- # 'pos_wizard.xml',
'pos_view.xml',
'report/report_pos_order_view.xml',
'report/report_cash_register_view.xml',
@@ -76,7 +75,6 @@
'statement_data.xml',
],
'demo_xml': ['pos_demo.xml','singer_statement_demo.xml','multi_company_stock_data.xml'],
-# 'test':['test/pos_test.yml',],
'installable': True,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'point_of_sale/pos.py'
--- point_of_sale/pos.py 2010-08-11 08:27:53 +0000
+++ point_of_sale/pos.py 2010-08-13 13:36:19 +0000
@@ -310,7 +310,6 @@
'pickings': fields.one2many('stock.picking', 'pos_order', 'Picking', readonly=True),
'picking_id': fields.many2one('stock.picking', 'Last Output Picking', readonly=True),
'first_name': fields.char('First Name', size=64),
-# 'state_2': fields.function(_get_v,type='selection',selection=[('to_verify', 'To Verify'), ('accepted', 'Accepted'),('refused', 'Refused')], string='State', readonly=True, method=True, store=True),
'note': fields.text('Internal Notes'),
'nb_print': fields.integer('Number of Print', readonly=True),
'sale_journal': fields.many2one('account.journal', 'Journal', required=True, states={'draft': [('readonly', False)]}, readonly=True, ),
@@ -353,7 +352,6 @@
'sale_manager': lambda self, cr, uid, context: uid,
'state': lambda *a: 'draft',
'price_type': lambda *a: 'tax_excluded',
-# 'state_2': lambda *a: 'to_verify',
'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'pos.order'),
'date_order': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
'date_validity': lambda *a: (DateTime.now() + DateTime.RelativeDateTime(months=+6)).strftime('%Y-%m-%d'),
@@ -479,7 +477,7 @@
'invoice_state': 'none',
'auto_picking': True,
'pos_order': order.id,
- })
+ })
self.write(cr, uid, [order.id], {'picking_id': picking_id})
else:
picking_id = order.picking_id.id
@@ -501,7 +499,6 @@
cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order.shop_id.warehouse_id.id))
res=cr.fetchone()
location_id=res and res[0] or None
-# location_id = order and order.shop_id and order.shop_id.warehouse_id and order.shop_id.warehouse_id.lot_stock_id.id or None
stock_dest_id = val.id
if line.qty < 0:
location_id, stock_dest_id = stock_dest_id, location_id
@@ -556,28 +553,6 @@
raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
return True
-# def button_validate(self, cr, uid, ids, *args):
-#
-# """ Check the access for the sale order and update the date_validation
-# @return: True
-# """
-# res_obj = self.pool.get('res.company')
-# try:
-# part_company=res_obj.browse(cr,uid,uid) and res_obj.browse(cr,uid,uid).parent_id and res_obj.browse######(cr,uid,uid).parent_id.id or None
-# except Exception, e:
-# raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
-# if part_company:
-# raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
-# for order in self.browse(cr, uid, ids):
-# if not order.date_validation:
-# cr.execute("select max(date) from account_bank_statement_line where pos_statement_id=%d"%(order.id))
-# val=cr.fetchone()
-# val=val and val[0] or None
-# if val:
-# cr.execute("Update pos_order set date_validation='%s', state_2 ='%s' where id = %d"%(val, 'accepted', order.id))
-# return True
-
-
def cancel_order(self, cr, uid, ids, context=None):
""" Changes order state to cancel
@@ -601,11 +576,9 @@
if not order.num_sale and data['num_sale']:
self.write(cr,uid,order_id,{'num_sale': data['num_sale']})
ids_new=[]
-# if order.invoice_wanted and not order.partner_id:
-# raise osv.except_osv(_('Error'), _('Cannot create invoice without a partner.'))
args = {
'amount': data['amount'],
- }
+ }
if 'payment_date' in data.keys():
args['date'] = data['payment_date']
if 'payment_name' in data.keys():
@@ -660,7 +633,7 @@
'product_id': product_id,
'qty': qty,
'price_unit': price,
- })
+ })
wf_service = netsvc.LocalService("workflow")
wf_service.trg_write(uid, 'pos.order', order_id, cr)
@@ -954,13 +927,15 @@
for st in stat_l.move_ids:
for s in st.line_id:
if s.credit:
- account_move_line_obj.copy(cr, uid, s.id, { 'debit': s.credit,
- 'statement_id': False,
- 'credit': s.debit})
- account_move_line_obj.copy(cr, uid, s.id, {
- 'statement_id': False,
- 'account_id':order_account
- })
+ account_move_line_obj.copy(cr, uid, s.id, {
+ 'debit': s.credit,
+ 'statement_id': False,
+ 'credit': s.debit
+ })
+ account_move_line_obj.copy(cr, uid, s.id, {
+ 'statement_id': False,
+ 'account_id':order_account
+ })
self.write(cr,uid,order.id,{'state':'done'})
return True
@@ -1019,7 +994,7 @@
class account_bank_statement(osv.osv):
_inherit = 'account.bank.statement'
- _columns={
+ _columns= {
'user_id': fields.many2one('res.users',ondelete='cascade',string='User', readonly=True),
}
_defaults = {
@@ -1034,7 +1009,7 @@
for line in self.browse(cr, uid, ids):
res[line.id] = line.statement_id and line.statement_id.journal_id and line.statement_id.journal_id.name or None
return res
- _columns={
+ _columns= {
'journal_id': fields.function(_get_statement_journal, method=True,store=True, string='Journal', type='char', size=64),
'am_out':fields.boolean("To count"),
'is_acc':fields.boolean("Is accompte"),
@@ -1123,7 +1098,7 @@
def onchange_dis(self, cr, uid,ids, qty, price_subtotal_incl, discount,*a):
price_sub = price_subtotal_incl
sub_total_discount = price_sub-(price_subtotal_incl*(discount*0.01))
- return {'value': {'price_subtotal_incl':sub_total_discount}}
+ return {'value': {'price_subtotal_incl':sub_total_discount}}
def onchange_ded(self, cr, uid,ids, val_ded,price_u,*a):
pos_order = self.pool.get('pos.order.line')
@@ -1169,7 +1144,7 @@
'discount': fields.float('Discount (%)', digits=(16, 2)),
'order_id': fields.many2one('pos.order', 'Order Ref', ondelete='cascade'),
'create_date': fields.datetime('Creation Date', readonly=True),
- }
+ }
_defaults = {
'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'pos.order.line'),
@@ -1180,17 +1155,6 @@
'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
}
-# def _check_qty(self, cr, uid, ids):
-# lines = self.browse(cr, uid, ids)
-# for line in lines:
-# if line.qty <= 0:
-# return False
-# return True
-
-# _constraints = [
-# (_check_qty, 'Order quantity cannot be negative or zero !', ['qty']),
-# ]
-
def create(self, cr, user, vals, context={}):
if vals.get('product_id'):
return super(pos_order_line, self).create(cr, user, vals, context)
@@ -1230,7 +1194,7 @@
'qty': qty,
'name': product_name,
'order_id': order,
- }
+ }
line_id = self.create(cr, uid, vals)
if not line_id:
raise osv.except_osv(_('Error'), _('Create line failed !'))
@@ -1245,7 +1209,13 @@
line_id = order_line_id
price_line = float(qty)*float(price)
- return {'name': product_name, 'product_id': product_id[0], 'price': price, 'price_line': price_line ,'qty': qty }
+ return {
+ 'name': product_name,
+ 'product_id': product_id[0],
+ 'price': price,
+ 'price_line': price_line ,
+ 'qty': qty
+ }
pos_order_line()
@@ -1346,10 +1316,10 @@
'expense_pdt': fields.boolean('Product for expenses'),
'am_out': fields.boolean('Controle for Outgoing Operations'),
'disc_controle': fields.boolean('Discount Controle '),
-}
+ }
_defaults = {
'disc_controle': lambda *a: True,
-}
+ }
product_product()
class stock_picking(osv.osv):
=== modified file 'point_of_sale/pos_view.xml'
--- point_of_sale/pos_view.xml 2010-08-11 11:55:47 +0000
+++ point_of_sale/pos_view.xml 2010-08-13 13:36:19 +0000
@@ -12,7 +12,6 @@
<field name="arch" type="xml">
<form string="Sales Order POS">
<group col="6" colspan="4">
- <!--field name="user_salesman_id" />
<field name="partner_id" on_change="onchange_partner_pricelist(partner_id)"/>
<field name="contract_number" groups="base.group_extended"/> -->
@@ -23,13 +22,10 @@
<tree string="Order lines" editable="bottom">
<field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)" width="275" />
<field name="qty"/>
- <!--<field name="qty" on_change="onchange_qty(qty,price_unit)"/>-->
- <!--field name="qty_rfd" groups="base.group_extended"/-->
<field name="price_ded" on_change="onchange_ded(price_ded, price_subtotal_incl,price_unit)" invisible="1"/>
<field name="price_unit" readonly="1"/>
<field name="discount" on_change="onchange_discount(discount,price_unit)" />
<field name="notice" on_change="onchange_dis(qty,price_subtotal_incl,discount)"/>
- <!--field name="serial_number"/-->
<field name="price_subtotal" />
<field name="price_subtotal_incl" sum="Subtotal"/>
</tree>
@@ -48,21 +44,8 @@
<group colspan="4" col="7">
<field name="amount_tax"/>
<field name="amount_total"/>
- <!--button name="%(action_pos_discount)d" string="D_iscount" type="action" states="draft"/>
- <button name="dummy_button" string="Compute" type="object" /-->
</group>
-<!-- <group colspan="4" col="9" groups="base.group_extended">-->
-<!-- <separator colspan="4" string="Validation of the Sale"/>-->
-<!-- <newline/>-->
-<!-- <field name="state_2" />-->
-<!-- <button name="button_validate"-->
-<!-- string="Accept"-->
-<!-- type="object"-->
-<!-- icon="gtk-ok"-->
-<!-- states="paid, draft"-->
-<!-- attrs="{'invisible':[('state_2','=','accepted')]}"/>-->
-<!-- </group>-->
<separator colspan="4" string="Actions"/>
<group colspan="4" col="6">
<field name="state" />
@@ -83,24 +66,17 @@
<field name="company_id" groups="base.group_multi_company"/>
<field name="price_type" />
<field name="user_id" string="Salesman" groups="base.group_extended"/>
- <!--field name="sale_manager" /-->
</group>
<group colspan="2" col="2" name="Type">
<separator string="Dates" colspan="4"/>
<field name="date_order"/>
<field name="date_validation" />
<field name="date_payment" groups="base.group_extended"/>
-<!-- <field name="type_rec" colspan="4"/>-->
</group>
<group colspan="4">
-<!-- <separator string="Invoicing" colspan="4"/>-->
<field name="partner_id" on_change="onchange_partner_pricelist(partner_id)" invisible="1"/>
<field name="sale_journal" domain="[('type','=','sale')]" widget="selection" invisible="1"/>
<field name="pricelist_id" domain="[('type','=','sale')]" widget="selection" invisible="1"/>
-<!-- <field name="invoice_id"/>-->
-<!-- <group colspan="2" col="4">-->
-<!-- <button name="invoice" icon="gtk-execute" string="Create _Invoice" states="paid"/>-->
-<!-- </group>-->
</group>
<field name="statement_ids" colspan="4" nolabel="1">
@@ -800,8 +776,6 @@
id="products_for_output_operations"
groups="base.group_system"/>
-<!-- <menuitem name="Register Management" parent="menu_point_root"-->
-<!-- id="menu_point_config" sequence="4"/>-->
<menuitem
name="Input Operations" parent="menu_point_of_sale"
string="Refloat"
@@ -866,40 +840,6 @@
<!-- Miscelleanous Operations/Reporting -->
<menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep" sequence="20" groups="group_pos_manager,base.group_system"/>
-<!-- <menuitem name="Registers" parent="menu_point_rep" id="menu_point_report_register" sequence="0" />
- <menuitem name="Sales" parent="menu_point_rep" id="menu_point_report_sale" sequence="1" />
-
- <menuitem name="Details Of Operations" parent="menu_point_report_sale" id="menu_details_of_oper" sequence="1" groups="base.group_extended,group_pos_manager,base.group_system"/>
- <menuitem name="All Sales" parent="menu_details_of_oper"
- id="menu_action_all_sales_tree3" action="action_pos_order_tree3" sequence="1" groups="base.group_extended,base.group_system,group_pos_manager"/>
- <menuitem name="Sales of the day" parent="menu_action_all_sales_tree3"
- id="menu_action_sale_of_day_tree2" action="action_trans_pos_tree_today"/>
- <menuitem name="Accepted Sales" parent="menu_action_all_sales_tree3"
- id="menu_action_sale_of_day_accept" action="action_pos_order_accepted"/>
-
- <menuitem name="Sales Reports" parent="menu_point_report_sale" id="menu_sales_report" sequence="2"/>
-
- <menuitem name="Sales of the day" parent="menu_sales_report"
- action="action_trans_pos_tree_today" id="menu_trans_pos_tree_today"/>
-
- <menuitem name="Sales of the month" parent="menu_sales_report"
- action="action_trans_pos_tree_month" id="menu_trans_pos_tree_month"/>
-
- <menuitem name="All the sales" parent="menu_sales_report"
- action="action_trans_pos_tree" id="menu_trans_pos_tree"/>
-
- <menuitem name="Sales by User" parent="menu_sales_report"
- action="action_report_sales_by_user_pos_today" id="menu_report_sales_by_user_pos_tree"/>
-
- <menuitem name="Sales by User Monthly" parent="menu_sales_report"
- action="action_report_sales_by_user_pos_month" id="menu_report_sales_by_user_pos_month_tree"/>
-
- <menuitem name="Sales by User Daily Margin" parent="menu_sales_report"
- action="action_report_sales_by_margin_pos_today" id="menu_report_sales_by_user_margin_daily_pos_tree"/>
-
- <menuitem name="Sales by User Monthly Margin" parent="menu_sales_report"
- action="action_report_sales_by_margin_pos_month" id="menu_report_sales_by_user_pos_month_margin_tree"/>
--->
<!-- Invoice -->
<record model="ir.actions.act_window" id="action_pos_invoice">
@@ -910,41 +850,9 @@
<field name="view_mode">tree,form</field>
<field name="domain">[('origin','like','POS')]</field>
</record>
-<!-- <menuitem name="All Invoices" parent="menu_details_of_oper"
- action="action_pos_invoice" id="menu_pos_invoice_tree"/>
-
- <menuitem name="Payments and Sales" parent="menu_point_report_sale"
- id="menu_cashboxes_closing_tree" sequence="1"/>
- <menuitem name="Today" parent="menu_cashboxes_closing_tree"
- id="menu_cashboxes_by_day" sequence="1"/>
-
- <menuitem name="All Sales Lines" parent="menu_details_of_oper"
- id="menu_action_pos_order_line" action="action_pos_order_line" sequence="2"/>
-
- <menuitem name="Sales Lines of the day" parent="menu_action_pos_order_line"
- id="menu_action_pos_order_line_day" action="action_pos_order_line_day"/>
-
-
- <menuitem icon="STOCK_PRINT" action="action_report_pos_sale_user"
- id="menu_pos_sales_user" parent="menu_trans_pos_tree" sequence="3" groups="base.group_extended" />
--->
<menuitem icon="STOCK_PRINT" action="action_report_pos_payment_repport_date"
id="menu_pos_payment_report_date" parent="menu_point_rep" sequence="8" groups="base.group_extended"/>
-<!--
- <menuitem icon="STOCK_PRINT" action="action_report_pos_payment_report_user"
- id="menu_pos_payment_report_user" parent="menu_trans_pos_tree_today" sequence="6" groups="base.group_extended"/>
- <menuitem icon="STOCK_PRINT" action="action_pos_sales_user_today"
- id="menu_pos_sales_user_today" parent="menu_trans_pos_tree_today" sequence="2" groups="base.group_extended"/>
-
- <menuitem icon="STOCK_PRINT" action="action_report_pos_payment_repport_date"
- id="menu_pos_payment_report_date" parent="menu_trans_pos_tree" sequence="5" groups="base.group_extended"/>
-
- <menuitem icon="STOCK_PRINT" action="action_report_pos_payment_report_user"
- id="menu_pos_payment_report_user" parent="menu_trans_pos_tree_today" sequence="6" groups="base.group_extended"/>
- <menuitem icon="STOCK_PRINT" action="action_report_pos_sales_user_today_current_user"
- id="menu_pos_sales_user_today_current_user" parent="menu_cashboxes_by_day" sequence="7"/>
--->
<menuitem icon="STOCK_PRINT" action="action_report_pos_details"
id="menu_pos_details" parent="menu_point_rep" sequence="6" />
=== modified file 'point_of_sale/pos_workflow.xml.orig'
--- point_of_sale/pos_workflow.xml.orig 2010-01-18 08:38:26 +0000
+++ point_of_sale/pos_workflow.xml.orig 2010-08-13 13:36:19 +0000
@@ -219,7 +219,6 @@
<field name="act_from" ref="act_paid"/>
<field name="act_to" ref="act_done"/>
<field name="signal">done</field>
- <!-- <field name="role_id" ref="role_pos"/-->
</record>
<record model="workflow.transition" id="trans_paid_invoice">
=== modified file 'point_of_sale/report/account_statement.py'
--- point_of_sale/report/account_statement.py 2010-08-09 11:14:53 +0000
+++ point_of_sale/report/account_statement.py 2010-08-13 13:36:19 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -29,9 +29,9 @@
super(account_statement, self).__init__(cr, uid, name, context)
self.total = 0.0
self.localcontext.update({
- 'time': time,
- 'get_total':self._get_total,
- })
+ 'time': time,
+ 'get_total':self._get_total,
+ })
def _get_total(self, statement_line_ids):
total = 0.0
for line in statement_line_ids:
=== modified file 'point_of_sale/report/all_closed_cashbox_of_the_day.py'
--- point_of_sale/report/all_closed_cashbox_of_the_day.py 2010-08-09 11:14:53 +0000
+++ point_of_sale/report/all_closed_cashbox_of_the_day.py 2010-08-13 13:36:19 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -37,7 +37,7 @@
'get_user':self._get_user,
'get_sub_total':self._get_sub_total,
'get_net_total_starting':self._get_net_total_starting,
- })
+ })
def _get_user(self,line_ids):
sql = "select name from res_users where id = %d"%(line_ids['create_uid'])
self.cr.execute(sql)
@@ -109,7 +109,7 @@
total_starting_bal = 0.0
sql = """ SELECT abs.id,abs.balance_end_real as net_total FROM account_bank_statement as abs
WHERE to_char(date_trunc('day',abs.date),'YYYY-MM-DD')::date = current_date
- and abs.state IN ('confirm','open')
+ and abs.state IN ('confirm','open')
and abs.user_id = %d"""%(user.id)
self.cr.execute(sql)
res = self.cr.dictfetchall()
=== modified file 'point_of_sale/report/point_of_sale_report.py'
--- point_of_sale/report/point_of_sale_report.py 2010-04-23 09:53:26 +0000
+++ point_of_sale/report/point_of_sale_report.py 2010-08-13 13:36:19 +0000
@@ -148,10 +148,8 @@
_description = "Sales by margin"
_auto = False
_columns = {
-# 'pos_name': fields.char('POS Order', size=64, readonly=True),
'product_name':fields.char('Product Name', size=64, readonly=True),
'date_order': fields.date('Order Date',required=True, select=True),
- # 'amount': fields.float('Total', readonly=True, select=True),
'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
'qty': fields.float('Qty', readonly=True, select=True),
'net_margin_per_qty':fields.float('Net margin per Qty', readonly=True, select=True),
@@ -197,14 +195,12 @@
_description = "Sales by margin monthly"
_auto = False
_columns = {
-
'product_name':fields.char('Product Name', size=64, readonly=True),
'date_order': fields.date('Order Date',required=True, select=True),
'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
'qty': fields.float('Qty', readonly=True, select=True),
'net_margin_per_qty':fields.float('Net margin per Qty', readonly=True, select=True),
'total':fields.float('Margin', readonly=True, select=True),
-
}
def init(self, cr):
=== modified file 'point_of_sale/report/pos_details.py'
--- point_of_sale/report/pos_details.py 2010-08-10 05:58:45 +0000
+++ point_of_sale/report/pos_details.py 2010-08-13 13:36:19 +0000
@@ -96,17 +96,6 @@
self.total_paid=res3[0]
return res3[0] or False
-# def _get_qty_total(self, objects):
-# #code for the sum of qty_total
-# return reduce(lambda acc, object:
-# acc + reduce(
-# lambda sum_qty, line:
-# sum_qty + line.qty,
-# object.lines,
-# 0),
-# objects,
-# 0)
-
def _get_sum_discount(self, objects):
#code for the sum of discount value
return reduce(lambda acc, object:
@@ -119,18 +108,6 @@
0.0)
def _get_payments(self, form,user, ignore_gift=False):
-# gift_journal_id = None
-# if ignore_gift:
-# config_journal_ids = self.pool.get("pos.config.journal").search(self.cr, self.uid, [('code', '=', 'GIFT')])
-# if len(config_journal_ids):
-# config_journal = self.pool.get("pos.config.journal").browse(self.cr, self.uid, config_journal_ids, {})[0]
-# gift_journal_id = config_journal.journal_id.id
-#
-# result = {}
-# for obj in objects:
-# for payment in obj.statement_ids:
-# result[payment.journal_id] = result.get(payment.journal_id, 0.0) + payment.amount
-# return result
statement_line_obj = self.pool.get("account.bank.statement.line")
gift_journal_id = None
if ignore_gift:
@@ -200,13 +177,6 @@
temp.update({'amount':temp2})
return [temp] or False
-# def _get_period(self, form):
-# min_date = form['date_start']
-# max_date = form['date_end']
-# if min_date == max_date:
-# return '%s' % min_date
-# else:
-# return '%s - %s' % (min_date, max_date)
def _get_period(self, form):
return form['date_start']
=== modified file 'point_of_sale/report/pos_lines.py'
--- point_of_sale/report/pos_lines.py 2010-08-09 11:14:53 +0000
+++ point_of_sale/report/pos_lines.py 2010-08-13 13:36:19 +0000
@@ -29,9 +29,9 @@
super(pos_lines, self).__init__(cr, uid, name, context)
self.total = 0.0
self.localcontext.update({
- 'time': time,
- 'total_quantity': self.__total_quantity__,
- 'taxes':self.__taxes__,
+ 'time': time,
+ 'total_quantity': self.__total_quantity__,
+ 'taxes':self.__taxes__,
})
=== modified file 'point_of_sale/report/pos_payment_report.py'
--- point_of_sale/report/pos_payment_report.py 2010-08-09 11:14:53 +0000
+++ point_of_sale/report/pos_payment_report.py 2010-08-13 13:36:19 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import time
@@ -28,10 +28,10 @@
super(pos_payment_report, self).__init__(cr, uid, name, context)
self.total = 0.0
self.localcontext.update({
- 'time': time,
- 'pos_payment': self._pos_payment,
- 'pos_payment_total':self._pos_payment_total,
- })
+ 'time': time,
+ 'pos_payment': self._pos_payment,
+ 'pos_payment_total':self._pos_payment_total,
+ })
def _pos_payment(self,obj):
data={}
@@ -51,19 +51,13 @@
"where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
"and po.state IN ('paid','invoiced') and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date")
data=self.cr.dictfetchall()
-
+
for d in data:
self.total += d['price_unit'] * d['qty']
return data
def _pos_payment_total(self,o):
-# res=[]
-# self.cr.execute ("select sum(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) " \
-# "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
-# "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
-# "and po.state='paid' and po.date_order = current_date and po.id=%d"%(o.id))
-# res=self.cr.fetchone()[0]
return self.total
=== modified file 'point_of_sale/report/pos_payment_report_date.py'
--- point_of_sale/report/pos_payment_report_date.py 2010-08-11 11:23:52 +0000
+++ point_of_sale/report/pos_payment_report_date.py 2010-08-13 13:36:19 +0000
@@ -28,10 +28,10 @@
super(pos_payment_report_date, self).__init__(cr, uid, name, context)
self.total = 0.0
self.localcontext.update({
- 'time': time,
- 'pos_payment_date': self.__pos_payment_date__,
- 'pos_payment_date_total':self.__pos_payment_date__total__,
- })
+ 'time': time,
+ 'pos_payment_date': self.__pos_payment_date__,
+ 'pos_payment_date_total':self.__pos_payment_date__total__,
+ })
def __pos_payment_date__(self,form):
dt1 = form['date_start'] + ' 00:00:00'
=== modified file 'point_of_sale/report/pos_payment_report_user.py'
--- point_of_sale/report/pos_payment_report_user.py 2010-08-09 11:14:53 +0000
+++ point_of_sale/report/pos_payment_report_user.py 2010-08-13 13:36:19 +0000
@@ -27,10 +27,10 @@
super(pos_payment_report_user, self).__init__(cr, uid, name, context)
self.total = 0.0
self.localcontext.update({
- 'time': time,
- 'pos_payment_user': self.__pos_payment_user__,
- 'pos_payment_user_total':self.__pos_payment_user__total__,
- })
+ 'time': time,
+ 'pos_payment_user': self.__pos_payment_user__,
+ 'pos_payment_user_total':self.__pos_payment_user__total__,
+ })
def __pos_payment_user__(self,form):
data={}
=== modified file 'point_of_sale/report/pos_sales_user.py'
--- point_of_sale/report/pos_sales_user.py 2010-08-09 11:14:53 +0000
+++ point_of_sale/report/pos_sales_user.py 2010-08-13 13:36:19 +0000
@@ -28,10 +28,10 @@
super(pos_sales_user, self).__init__(cr, uid, name, context)
self.total = 0.0
self.localcontext.update({
- 'time': time,
- 'get_data':self._get_data,
+ 'time': time,
+ 'get_data':self._get_data,
- })
+ })
def _get_data(self,form):
dt1 = form['date_start'] + ' 00:00:00'
=== modified file 'point_of_sale/report/pos_sales_user_today.py'
--- point_of_sale/report/pos_sales_user_today.py 2010-08-09 11:14:53 +0000
+++ point_of_sale/report/pos_sales_user_today.py 2010-08-13 13:36:19 +0000
@@ -28,10 +28,10 @@
super(pos_sales_user_today, self).__init__(cr, uid, name, context)
self.total = 0.0
self.localcontext.update({
- 'time': time,
- 'get_data':self._get_data,
+ 'time': time,
+ 'get_data':self._get_data,
- })
+ })
def _get_data(self,form):
data={}
=== modified file 'point_of_sale/report/pos_sales_user_today_current_user.py'
--- point_of_sale/report/pos_sales_user_today_current_user.py 2010-08-09 11:14:53 +0000
+++ point_of_sale/report/pos_sales_user_today_current_user.py 2010-08-13 13:36:19 +0000
@@ -29,12 +29,12 @@
self.total = 0.0
self.qty = 0.0
self.localcontext.update({
- 'time': time,
- 'get_user':self._get_user,
- 'get_data_current_user':self._get_data_current_user,
- 'get_data_current_user_tot':self._get_data_current_user_tot,
- 'get_data_current_user_qty':self._get_data_current_user_qty,
- })
+ 'time': time,
+ 'get_user':self._get_user,
+ 'get_data_current_user':self._get_data_current_user,
+ 'get_data_current_user_tot':self._get_data_current_user_tot,
+ 'get_data_current_user_qty':self._get_data_current_user_qty,
+ })
def _get_user(self, user):
pos_user={}
@@ -58,15 +58,6 @@
return data
def _get_data_current_user_tot(self, user):
-# res={}
-# self.cr.execute("select sum(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) " \
-# "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt ,res_users as ru,res_company as rc " \
-# "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
-# "and po.date_order = current_date and po.user_id = ru.id and rc.id = %s and ru.id = %s " \
-# ,(str(self.uid),str(user.company_id.id)))
-#
-# res=self.cr.dictfetchone()
-# return res['sum']
return self.total
def _get_data_current_user_qty(self, user):
=== modified file 'point_of_sale/report/pos_users_product.py'
--- point_of_sale/report/pos_users_product.py 2010-08-09 11:14:53 +0000
+++ point_of_sale/report/pos_users_product.py 2010-08-13 13:36:19 +0000
@@ -28,12 +28,12 @@
super(pos_user_product, self).__init__(cr, uid, name, context)
self.total = 0.0
self.localcontext.update({
- 'time': time,
- 'get_data':self._get_data,
- 'get_user':self._get_user,
- 'get_total':self._get_total,
+ 'time': time,
+ 'get_data':self._get_data,
+ 'get_user':self._get_user,
+ 'get_total':self._get_total,
- })
+ })
def _get_data(self,o):
data={}
sql1=""" SELECT distinct(o.id) from account_bank_statement s, account_bank_statement_line l,pos_order o,pos_order_line i where i.order_id=o.id and o.state='paid' and l.statement_id=s.id and l.pos_statement_id=o.id and s.id=%d"""%(o.id)
=== modified file 'point_of_sale/report/report_cash_register.py'
--- point_of_sale/report/report_cash_register.py 2010-07-08 07:36:35 +0000
+++ point_of_sale/report/report_cash_register.py 2010-08-13 13:36:19 +0000
@@ -25,15 +25,15 @@
_name = "report.cash.register"
_description = "Point of Sale Cash Register Analysis"
_auto = False
- _columns ={
+ _columns = {
'date': fields.date('Create Date', readonly=True),
'year': fields.char('Year', size=4),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
'day': fields.char('Day', size=128, readonly=True),
- 'user_id':fields.many2one('res.users', 'User', readonly=True),
- 'state':fields.selection([('draft', 'Draft'),('confirm', 'Confirmed')],'State'),
+ 'user_id':fields.many2one('res.users', 'User', readonly=True),
+ 'state':fields.selection([('draft', 'Draft'),('confirm', 'Confirmed')],'State'),
'journal_id': fields.many2one('account.journal', 'Journal'),
'balance_start': fields.float('Opening Balance'),
'balance_end_real': fields.float('Closing Balance'),
@@ -43,9 +43,9 @@
tools.drop_view_if_exists(cr, 'report_cash_register')
cr.execute("""
create or replace view report_cash_register as (
- select
+ select
min(s.id) as id,
- to_date(to_char(s.create_date, 'dd-MM-YYYY'),'dd-MM-YYYY') as date,
+ to_date(to_char(s.create_date, 'dd-MM-YYYY'),'dd-MM-YYYY') as date,
s.user_id as user_id,
s.journal_id as journal_id,
s.state as state,
@@ -54,8 +54,8 @@
to_char(s.create_date, 'YYYY') as year,
to_char(s.create_date, 'MM') as month,
to_char(s.create_date, 'YYYY-MM-DD') as day
- from account_bank_statement as s where s.user_id=1
- group by
+ from account_bank_statement as s where s.user_id=1
+ group by
s.user_id,s.journal_id, s.balance_start, s.balance_end_real,s.state,to_char(s.create_date, 'dd-MM-YYYY'),
to_char(s.create_date, 'YYYY'),
to_char(s.create_date, 'MM'),
=== modified file 'point_of_sale/report/report_pos_order.py'
--- point_of_sale/report/report_pos_order.py 2010-07-14 06:42:47 +0000
+++ point_of_sale/report/report_pos_order.py 2010-08-13 13:36:19 +0000
@@ -26,7 +26,7 @@
_name = "report.pos.order"
_description = "Point of Sale Orders Statistics"
_auto = False
- _columns ={
+ _columns = {
'date': fields.date('Date Order', readonly=True),
'year': fields.char('Year', size=4, readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
@@ -39,8 +39,6 @@
('advance','Advance'),
('paid', 'Paid'), ('done', 'Done'), ('invoiced', 'Invoiced'), ('cancel', 'Cancel')],
'State'),
-# 'state_2': fields.function([('to_verify', 'To Verify'), ('accepted', 'Accepted'),
-# ('refused', 'Refused')], string='State'),
'user_id':fields.many2one('res.users', 'Salesman', readonly=True),
'price_total':fields.float('Total Price', readonly=True),
'total_discount':fields.float('Total Discount', readonly=True),
=== modified file 'point_of_sale/report/report_pos_order_view.xml'
--- point_of_sale/report/report_pos_order_view.xml 2010-08-09 11:07:08 +0000
+++ point_of_sale/report/report_pos_order_view.xml 2010-08-13 13:36:19 +0000
@@ -78,9 +78,7 @@
<filter string="Customer" icon="terp-personal" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
- <!--<filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>-->
<separator orientation="vertical"/>
- <!--<filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>-->
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
<filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
=== modified file 'point_of_sale/statement_wizard.xml'
--- point_of_sale/statement_wizard.xml 2010-06-12 16:21:54 +0000
+++ point_of_sale/statement_wizard.xml 2010-08-13 13:36:19 +0000
@@ -1,21 +1,6 @@
<openerp>
<data>
-<!-- <wizard
- id="close_statement"
- model="account.bank.statement"
- menu="True"
- name="statement.close"
- string="Close Statements"/>
- <menuitem
- name="Close Register" parent="point_of_sale.menu_point_config"
- string="Close Register"
- action="close_statement"
- type="wizard"
- id="menu_close_statement" sequence="4" />
-
--->
-
<menuitem icon="STOCK_PRINT"
action="action_report_all_closed_cashbox_of_the_day"
id="menu_all_closed_cashbox_of_the_day"
=== modified file 'point_of_sale/wizard/all_closed_cashbox_of_the_day.py'
--- point_of_sale/wizard/all_closed_cashbox_of_the_day.py 2010-08-09 11:14:53 +0000
+++ point_of_sale/wizard/all_closed_cashbox_of_the_day.py 2010-08-13 13:36:19 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -30,28 +30,28 @@
_description = 'All closed cashbox of the day'
_columns = {
-
+
}
-
+
def print_report(self, cr, uid, ids, context=None):
- """
- To get the date and print the report
-
+ """
+ To get the date and print the report
+
@param self: The object pointer.
@param cr: A database cursor
@param uid: ID of the user currently logged in
- @param context: A standard dictionary
+ @param context: A standard dictionary
@return : retrun report
- """
+ """
datas = {'ids' : context.get('active_ids',[])}
- res = {}
+ res = {}
datas['form'] = res
-
- return {
- 'type' : 'ir.actions.report.xml',
- 'report_name':'all.closed.cashbox.of.the.day',
- 'datas' : datas,
+
+ return {
+ 'type' : 'ir.actions.report.xml',
+ 'report_name':'all.closed.cashbox.of.the.day',
+ 'datas' : datas,
}
all_closed_cashbox_of_the_day()
=== modified file 'point_of_sale/wizard/pos_box_entries.py'
--- point_of_sale/wizard/pos_box_entries.py 2010-08-09 09:58:47 +0000
+++ point_of_sale/wizard/pos_box_entries.py 2010-08-13 13:36:19 +0000
@@ -71,16 +71,16 @@
_columns = {
- 'name': fields.char('Description', size=32, required=True),
- 'journal_id': fields.selection(get_journal, "Register", required=True),
- 'product_id': fields.selection(_get_income_product, "Operation", required=True),
- 'amount': fields.float('Amount', digits=(16, 2)),
- 'ref': fields.char('Ref', size=32),
+ 'name': fields.char('Description', size=32, required=True),
+ 'journal_id': fields.selection(get_journal, "Register", required=True),
+ 'product_id': fields.selection(_get_income_product, "Operation", required=True),
+ 'amount': fields.float('Amount', digits=(16, 2)),
+ 'ref': fields.char('Ref', size=32),
}
_defaults = {
- 'journal_id': lambda *a: 1,
- 'product_id': lambda *a: 1,
- }
+ 'journal_id': lambda *a: 1,
+ 'product_id': lambda *a: 1,
+ }
def get_in(self, cr, uid, ids, context):
"""
@@ -109,11 +109,12 @@
if statement_id:
statement_id = statement_id[0]
if not statement_id:
- statement_id = statement_obj.create(cr, uid, {'date': time.strftime('%Y-%m-%d 00:00:00'),
- 'journal_id': data['journal_id'],
- 'company_id': curr_company,
- 'user_id': uid,
- })
+ statement_id = statement_obj.create(cr, uid, {
+ 'date': time.strftime('%Y-%m-%d 00:00:00'),
+ 'journal_id': data['journal_id'],
+ 'company_id': curr_company,
+ 'user_id': uid,
+ })
args['statement_id'] = statement_id
args['journal_id'] = data['journal_id']
=== modified file 'point_of_sale/wizard/pos_box_out.py'
--- point_of_sale/wizard/pos_box_out.py 2010-06-28 15:06:31 +0000
+++ point_of_sale/wizard/pos_box_out.py 2010-08-13 13:36:19 +0000
@@ -49,16 +49,16 @@
return res
_columns = {
- 'name': fields.char('Description', size=32, required=True),
- 'journal_id': fields.selection(pos_box_entries.get_journal, "Register", required=True),
- 'product_id': fields.selection(_get_expense_product, "Operation", required=True),
- 'amount': fields.float('Amount', digits=(16, 2)),
- 'ref': fields.char('Ref', size=32),
+ 'name': fields.char('Description', size=32, required=True),
+ 'journal_id': fields.selection(pos_box_entries.get_journal, "Register", required=True),
+ 'product_id': fields.selection(_get_expense_product, "Operation", required=True),
+ 'amount': fields.float('Amount', digits=(16, 2)),
+ 'ref': fields.char('Ref', size=32),
}
_defaults = {
- 'journal_id': lambda *a: 1,
- 'product_id': lambda *a: 1,
- }
+ 'journal_id': lambda *a: 1,
+ 'product_id': lambda *a: 1,
+ }
def get_out(self, cr, uid, ids, context):
"""
@@ -102,11 +102,12 @@
if statement_id:
statement_id = statement_id[0]
if not statement_id:
- statement_id = statement_obj.create(cr, uid, {'date': time.strftime('%Y-%m-%d 00:00:00'),
- 'journal_id': data['journal_id'],
- 'company_id': curr_company,
- 'user_id': uid,
- })
+ statement_id = statement_obj.create(cr, uid, {
+ 'date': time.strftime('%Y-%m-%d 00:00:00'),
+ 'journal_id': data['journal_id'],
+ 'company_id': curr_company,
+ 'user_id': uid,
+ })
args['statement_id'] = statement_id
args['journal_id'] = data['journal_id']
if acc_id:
=== modified file 'point_of_sale/wizard/pos_box_out.xml'
--- point_of_sale/wizard/pos_box_out.xml 2010-06-22 11:14:10 +0000
+++ point_of_sale/wizard/pos_box_out.xml 2010-08-13 13:36:19 +0000
@@ -14,7 +14,6 @@
<field name="journal_id"/>
<field name="product_id"/>
<field name="amount"/>
-<!-- <field name="ref"/>-->
<group colspan="4" col="2">
<button icon='gtk-cancel' special="cancel"
string="Close" />
=== modified file 'point_of_sale/wizard/pos_close_statement.py'
--- point_of_sale/wizard/pos_close_statement.py 2010-08-10 12:38:18 +0000
+++ point_of_sale/wizard/pos_close_statement.py 2010-08-13 13:36:19 +0000
@@ -61,13 +61,14 @@
if id3:
id3 = data_obj.browse(cr, uid, id3, context=context).res_id
return {
- 'domain': "[('id','in'," + str(list_statement) + ")]",
- 'name': 'Close Statements',
- 'view_type': 'form',
- 'view_mode': 'tree,form',
- 'res_model': 'account.bank.statement',
- 'views': [(id2, 'tree'),(id3, 'form')],
- 'type': 'ir.actions.act_window'}
+ 'domain': "[('id','in'," + str(list_statement) + ")]",
+ 'name': 'Close Statements',
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'res_model': 'account.bank.statement',
+ 'views': [(id2, 'tree'),(id3, 'form')],
+ 'type': 'ir.actions.act_window'
+ }
pos_close_statement()
=== modified file 'point_of_sale/wizard/pos_discount.py'
--- point_of_sale/wizard/pos_discount.py 2010-06-14 08:07:49 +0000
+++ point_of_sale/wizard/pos_discount.py 2010-08-13 13:36:19 +0000
@@ -35,18 +35,18 @@
'discount': lambda *a: 5,
}
-
+
def view_init(self, cr, uid, fields_list, context=None):
- """
+ """
Creates view dynamically and adding fields at runtime.
@param self: The object pointer.
@param cr: A database cursor
@param uid: ID of the user currently logged in
- @param context: A standard dictionary
+ @param context: A standard dictionary
@return: New arch of view with new columns.
- """
+ """
res = super(pos_discount, self).view_init(cr, uid, fields_list, context=context)
- record_id = context and context.get('active_id', False) or False
+ record_id = context and context.get('active_id', False) or False
order = self.pool.get('pos.order').browse(cr, uid, record_id)
if not order.lines:
raise osv.except_osv('Error!','No Order Lines ')
@@ -68,7 +68,7 @@
order_ref = self.pool.get('pos.order')
order_line_ref = self.pool.get('pos.order.line')
-
+
for order in order_ref.browse(cr, uid, record_id, context=context):
for line in order.lines:
@@ -101,29 +101,6 @@
order_line_ref.write(cr, uid, [line.id], res_new, context=context)
return {}
-# def check_discount(self, cr, uid, record_id, discount, context):
-# """
-# Check the discount of define by company .
-# @param self: The object pointer.
-# @param cr: A database cursor
-# @param uid: ID of the user currently logged in
-# @param record_id:Current Order id
-# @param discount:Select Discount
-# @param context: A standard dictionary
-# @return : retrun to apply and used the company discount base on condition
-# """
-
-# order_ref = self.pool.get('pos.order')
-#
-# for order in order_ref.browse(cr, uid, record_id, context=context):
-# company_disc = order.company_id.company_discount
-# for line in order.lines :
-# prod_disc = discount
-# if prod_disc <= company_disc :
-# return 'apply_discount'
-# else :
-# return 'disc_discount'
-
pos_discount()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'point_of_sale/wizard/pos_get_sale.py'
--- point_of_sale/wizard/pos_get_sale.py 2010-05-26 08:28:37 +0000
+++ point_of_sale/wizard/pos_get_sale.py 2010-08-13 13:36:19 +0000
@@ -60,9 +60,9 @@
})
order = proxy_pick.write(cr, uid, [this.picking_id.id], {
- 'invoice_state': 'none',
- 'pos_order': record_id
- })
+ 'invoice_state': 'none',
+ 'pos_order': record_id
+ })
for line in pick.move_lines:
proxy_order_line.create(cr, uid, {
=== modified file 'point_of_sale/wizard/pos_open_statement.py'
--- point_of_sale/wizard/pos_open_statement.py 2010-08-10 13:29:34 +0000
+++ point_of_sale/wizard/pos_open_statement.py 2010-08-13 13:36:19 +0000
@@ -50,12 +50,12 @@
ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)])
if len(ids):
raise osv.except_osv(_('Message'), _('You can not open a Cashbox for "%s". \n Please close the cashbox related to. ' %(journal.name)))
-
+
statement_ids = sorted(statement_obj.search(cr, uid, [('state', '=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)]))
if statement_ids:
res = []
statement_ids.reverse()
- statement = statement_obj.browse(cr, uid, statement_ids[0])
+ statement = statement_obj.browse(cr, uid, statement_ids[0])
for end_bal in statement.ending_details_ids:
dct = {
'pieces': end_bal.pieces,
@@ -71,8 +71,8 @@
number = sequence_obj.get_id(cr, uid, journal.sequence_id.id)
else:
number = sequence_obj.get(cr, uid, 'account.bank.statement')
-
- data.update({'journal_id': journal.id,
+
+ data.update({'journal_id': journal.id,
'company_id': company_id,
'user_id': uid,
'state': 'open',
@@ -96,7 +96,7 @@
'res_model': 'account.bank.statement',
'views': [(id2, 'tree'),(id3, 'form')],
'type': 'ir.actions.act_window'
-}
+ }
pos_open_statement()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'point_of_sale/wizard/pos_payment.py'
--- point_of_sale/wizard/pos_payment.py 2010-08-11 10:30:12 +0000
+++ point_of_sale/wizard/pos_payment.py 2010-08-13 13:36:19 +0000
@@ -137,15 +137,10 @@
invoice_wanted = data['invoice_wanted']
# Todo need to check ...
-# if amount <= 0.0:
-# context.update({'flag':True})
-# order_obj.action_paid(cr, uid, [active_id], context)
-# return self.print_report(cr, uid, ids, context)
-
- if amount != 0.0:
+ if amount != 0.0:
order_obj.write(cr, uid, [active_id], {'invoice_wanted': invoice_wanted, 'partner_id': data['partner_id']})
order_obj.add_payment(cr, uid, active_id, data, context=context)
-
+
if order_obj.test_paid(cr, uid, [active_id]):
if data['partner_id'] and invoice_wanted:
order_obj.action_invoice(cr, uid, [active_id], context)
@@ -162,7 +157,7 @@
else:
order_obj.write(cr, uid, [active_id],{'state':'paid'})
return self.print_report(cr, uid, ids, context)
-
+
if order.amount_paid > 0.0:
context.update({'flag': True})
# Todo need to check
@@ -180,9 +175,9 @@
datas = {'ids': active_ids}
datas['form'] = {}
return {
- 'type' : 'ir.actions.report.xml',
- 'report_name':'pos.invoice',
- 'datas' : datas,
+ 'type' : 'ir.actions.report.xml',
+ 'report_name':'pos.invoice',
+ 'datas' : datas,
}
def print_report(self, cr, uid, ids, context=None):
=== modified file 'point_of_sale/wizard/pos_payment_report_date.py'
--- point_of_sale/wizard/pos_payment_report_date.py 2010-08-09 11:14:53 +0000
+++ point_of_sale/wizard/pos_payment_report_date.py 2010-08-13 13:36:19 +0000
@@ -43,19 +43,19 @@
datas['form'] = res
return {
- 'type': 'ir.actions.report.xml',
- 'report_name': 'pos.payment.report.date',
- 'datas': datas,
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'pos.payment.report.date',
+ 'datas': datas,
}
_columns = {
- 'date_start': fields.date('Start Date', required=True),
- 'date_end': fields.date('End Date', required=True),
- 'user_id': fields.many2many('res.users', 'res_user_sale', 'user_id', 'sale_id', 'Salesman')
+ 'date_start': fields.date('Start Date', required=True),
+ 'date_end': fields.date('End Date', required=True),
+ 'user_id': fields.many2many('res.users', 'res_user_sale', 'user_id', 'sale_id', 'Salesman')
}
_defaults = {
- 'date_start': lambda *a: time.strftime('%Y-%m-%d'),
- 'date_end': lambda *a: time.strftime('%Y-%m-%d'),
+ 'date_start': lambda *a: time.strftime('%Y-%m-%d'),
+ 'date_end': lambda *a: time.strftime('%Y-%m-%d'),
}
pos_payment_report_date()
=== modified file 'point_of_sale/wizard/pos_payment_report_user.py'
--- point_of_sale/wizard/pos_payment_report_user.py 2010-08-09 11:14:53 +0000
+++ point_of_sale/wizard/pos_payment_report_user.py 2010-08-13 13:36:19 +0000
@@ -42,13 +42,13 @@
datas['form'] = res
return {
- 'type': 'ir.actions.report.xml',
- 'report_name': 'pos.payment.report.user',
- 'datas': datas,
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'pos.payment.report.user',
+ 'datas': datas,
}
_columns = {
- 'user_id': fields.many2many('res.users', 'res_user_sale', 'user_id', 'sale_id', 'Salesman')
+ 'user_id': fields.many2many('res.users', 'res_user_sale', 'user_id', 'sale_id', 'Salesman')
}
pos_payment_report_user()
=== modified file 'point_of_sale/wizard/pos_payment_report_user.xml'
--- point_of_sale/wizard/pos_payment_report_user.xml 2010-03-19 15:00:20 +0000
+++ point_of_sale/wizard/pos_payment_report_user.xml 2010-08-13 13:36:19 +0000
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
- <data>
+ <data>
<!-- pos.details -->
-
+
<record id="view_pos_payment_report" model="ir.ui.view">
<field name="name">Pyament Report</field>
<field name="model">pos.payment.report</field>
@@ -28,13 +28,6 @@
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
-<!-- <act_window name="POS Details"
- res_model="pos.details"
- src_model="pos.order"
- view_mode="form"
- target="new"
- key2="client_action_multi"
- id="action_report_pos_details"/> -->
-
+
</data>
-</openerp>
\ No newline at end of file
+</openerp>
\ No newline at end of file
=== modified file 'point_of_sale/wizard/pos_receipt.py'
--- point_of_sale/wizard/pos_receipt.py 2010-08-09 11:14:53 +0000
+++ point_of_sale/wizard/pos_receipt.py 2010-08-13 13:36:19 +0000
@@ -31,19 +31,15 @@
}
def view_init(self, cr, uid, fields_list, context=None):
- """
+ """
Creates view dynamically and adding fields at runtime.
@param self: The object pointer.
@param cr: A database cursor
@param uid: ID of the user currently logged in
- @param context: A standard dictionary
+ @param context: A standard dictionary
@return: New arch of view with new columns.
- """
+ """
order_lst = self. pool.get('pos.order').browse(cr, uid, context['active_id'])
-# for order in order_lst:
-# if order.state_2 in ('to_verify'):
-# raise osv.except_osv(_('Error!', 'Can not print the receipt because of discount and/or payment '))
-# True
def print_report(self, cr, uid, ids, context=None):
=== modified file 'point_of_sale/wizard/pos_return.py'
--- point_of_sale/wizard/pos_return.py 2010-08-11 10:30:12 +0000
+++ point_of_sale/wizard/pos_return.py 2010-08-13 13:36:19 +0000
@@ -33,18 +33,18 @@
_description = 'Point of sale return'
def default_get(self, cr, uid, fields, context=None):
- """
+ """
To get default values for the object.
-
+
@param self: The object pointer.
@param cr: A database cursor
@param uid: ID of the user currently logged in
- @param fields: List of fields for which we want default values
- @param context: A standard dictionary
-
- @return: A dictionary which of fields with values.
-
- """
+ @param fields: List of fields for which we want default values
+ @param context: A standard dictionary
+
+ @return: A dictionary which of fields with values.
+
+ """
res = super(pos_return, self).default_get(cr, uid, fields, context=context)
order_obj = self.pool.get('pos.order')
@@ -54,44 +54,44 @@
for order in order_obj.browse(cr, uid, active_ids):
for line in order.lines:
if 'return%s'%(line.id) in fields:
- res['return%s'%(line.id)] = line.qty
+ res['return%s'%(line.id)] = line.qty
return res
-
+
def view_init(self, cr, uid, fields_list, context=None):
- """
+ """
Creates view dynamically and adding fields at runtime.
@param self: The object pointer.
@param cr: A database cursor
@param uid: ID of the user currently logged in
- @param context: A standard dictionary
+ @param context: A standard dictionary
@return: New arch of view with new columns.
- """
+ """
res = super(pos_return, self).view_init(cr, uid, fields_list, context=context)
- order_obj=self.pool.get('pos.order')
+ order_obj=self.pool.get('pos.order')
if not context:
- context={}
-
- active_ids=context.get('active_ids')
- for order in order_obj.browse(cr, uid, active_ids):
- for line in order.lines:
+ context={}
+
+ active_ids=context.get('active_ids')
+ for order in order_obj.browse(cr, uid, active_ids):
+ for line in order.lines:
if 'return%s'%(line.id) not in self._columns:
self._columns['return%s'%(line.id)] = fields.float("Quantity")
-
- return res
+
+ return res
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
- """
+ """
Changes the view dynamically
-
+
@param self: The object pointer.
@param cr: A database cursor
@param uid: ID of the user currently logged in
- @param context: A standard dictionary
-
+ @param context: A standard dictionary
+
@return: New arch of view.
-
- """
+
+ """
result = super(pos_return, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
if not context:
context={}
@@ -104,25 +104,25 @@
_moves_arch_lst="""<?xml version="1.0"?>
<form string="Return lines">
<label string="Quantities you enter, match to products that will return to the stock." colspan="4"/>"""
- _line_fields = result['fields']
+ _line_fields = result['fields']
order=order_obj.browse(cr, uid, active_id)
- for line in order.lines:
- quantity=line.qty
+ for line in order.lines:
+ quantity=line.qty
_line_fields.update({
- 'return%s'%(line.id) : {
- 'string': line.product_id.name,
- 'type' : 'float',
- 'required': True,
- 'default':quantity
- },
- })
+ 'return%s'%(line.id) : {
+ 'string': line.product_id.name,
+ 'type' : 'float',
+ 'required': True,
+ 'default':quantity
+ },
+ })
_moves_arch_lst += """
<field name="return%s"/>
- <newline/>
+ <newline/>
"""%(line.id)
-
+
_moves_arch_lst+="""
- <newline/>
+ <newline/>
<separator colspan="4"/>
<button icon='gtk-cancel' special="cancel"
string="Cancel" />
@@ -130,36 +130,36 @@
string="Return goods and Exchange" type="object"/>
<button icon='gtk-ok' name="create_returns2"
string="Return without Refund" type="object"/>
- </form>"""
-
+ </form>"""
+
result['arch'] = _moves_arch_lst
- result['fields'] = _line_fields
- return result
-
-
+ result['fields'] = _line_fields
+ return result
+
+
def create_returns(self, cr, uid, data, context):
- """
+ """
@param self: The object pointer.
@param cr: A database cursor
@param uid: ID of the user currently logged in
- @param context: A standard dictionary
-
+ @param context: A standard dictionary
+
@return: Return the add product form again for adding more product
-
+
"""
return {
- 'name': _('Add Product'),
- 'view_type': 'form',
- 'view_mode': 'form',
- 'res_model': 'pos.add.product',
- 'view_id': False,
- 'target':'new',
- 'views': False,
- 'context': context,
- 'type': 'ir.actions.act_window',
+ 'name': _('Add Product'),
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'pos.add.product',
+ 'view_id': False,
+ 'target':'new',
+ 'views': False,
+ 'context': context,
+ 'type': 'ir.actions.act_window',
}
def create_returns2(self, cr, uid, ids, context):
- active_id = context.get('active_id', False)
+ active_id = context.get('active_id', False)
order_obj =self.pool.get('pos.order')
line_obj = self.pool.get('pos.order.line')
picking_obj = self.pool.get('stock.picking')
@@ -182,10 +182,10 @@
location_id = res and res[0] or None
stock_dest_id = val.id
new_picking = picking_obj.copy(cr, uid, order_id.picking_id.id, {'name':'%s (return)' % order_id.name,
- 'move_lines': [],
- 'state':'draft',
+ 'move_lines': [],
+ 'state':'draft',
'type': 'in',
- 'address_id': order_id.partner_id.id,
+ 'address_id': order_id.partner_id.id,
'date': date_cur })
new_order = order_obj.copy(cr, uid, order_id.id, {'name': 'Refund %s'%order_id.name,
'lines':[],
@@ -197,7 +197,7 @@
qty = data['return%s' %line.id]
except :
qty = line.qty
- new_move = stock_move_obj.create(cr, uid,{
+ new_move = stock_move_obj.create(cr, uid, {
'product_qty': qty ,
'product_uos_qty': uom_obj._compute_qty(cr, uid, qty ,line.product_id.uom_id.id),
'picking_id': new_picking,
@@ -207,7 +207,8 @@
'location_dest_id': stock_dest_id,
'name': '%s (return)' %order_id.name,
'date': date_cur,
- 'date_planned': date_cur,})
+ 'date_planned': date_cur
+ })
line_obj.copy(cr, uid, line.id, {'qty': -qty, 'order_id': new_order})
order_obj.write(cr,uid, [active_id,new_order], {'state': 'done'})
wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
@@ -225,25 +226,25 @@
'type': 'ir.actions.act_window'
}
return act
-
+
pos_return()
class add_product(osv.osv_memory):
- _inherit = 'pos.add.product'
+ _inherit = 'pos.add.product'
def select_product(self, cr, uid, ids, context):
- """
- To get the product and quantity and add in order .
+ """
+ To get the product and quantity and add in order .
@param self: The object pointer.
@param cr: A database cursor
@param uid: ID of the user currently logged in
- @param context: A standard dictionary
+ @param context: A standard dictionary
@return : Retrun the add product form again for adding more product
- """
-
+ """
+
active_id=context.get('active_id', False)
data = self.read(cr, uid, ids)
data = data and data[0] or False
- if active_id:
+ if active_id:
order_obj = self.pool.get('pos.order')
lines_obj = self.pool.get('pos.order.line')
picking_obj = self.pool.get('stock.picking')
@@ -259,7 +260,7 @@
wf_service = netsvc.LocalService("workflow")
return_boj=self.pool.get('pos.return')
order_obj.add_product(cr, uid, active_id, data['product_id'], data['quantity'], context=context)
-
+
for order_id in order_obj.browse(cr, uid, [active_id], context=context):
prod=data['product_id']
qty=data['quantity']
@@ -269,15 +270,16 @@
res=cr.fetchone()
location_id=res and res[0] or None
stock_dest_id = val.id
-
+
prod_id=prod_obj.browse(cr, uid, prod)
- new_picking=picking_obj.create(cr, uid,{
- 'name':'%s (Added)' %order_id.name,
- 'move_lines':[],
- 'state':'draft',
- 'type':'out',
- 'date':date_cur, })
- new_move=stock_move_obj.create(cr, uid,{
+ new_picking=picking_obj.create(cr, uid, {
+ 'name':'%s (Added)' %order_id.name,
+ 'move_lines':[],
+ 'state':'draft',
+ 'type':'out',
+ 'date':date_cur
+ })
+ new_move=stock_move_obj.create(cr, uid, {
'product_qty': qty,
'product_uos_qty': uom_obj._compute_qty(cr, uid, prod_id.uom_id.id, qty, prod_id.uom_id.id),
'picking_id':new_picking,
@@ -287,33 +289,34 @@
'location_dest_id':stock_dest_id,
'name':'%s (return)' %order_id.name,
'date':date_cur,
- 'date_planned':date_cur,})
-
+ 'date_planned':date_cur
+ })
+
wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
picking_obj.force_assign(cr, uid, [new_picking], context)
order_obj.write(cr,uid,active_id,{'picking_id':new_picking})
-
-
- return {
- 'name': _('Add Product'),
- 'view_type': 'form',
- 'view_mode': 'form',
- 'res_model': 'pos.add.product',
- 'view_id': False,
- 'target':'new',
- 'context':context,
- 'views': False,
- 'type': 'ir.actions.act_window',
- }
-
+
+
+ return {
+ 'name': _('Add Product'),
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'pos.add.product',
+ 'view_id': False,
+ 'target':'new',
+ 'context':context,
+ 'views': False,
+ 'type': 'ir.actions.act_window',
+ }
+
def close_action(self, cr, uid, ids, context):
- active_ids=context.get('active_ids', False)
+ active_ids=context.get('active_ids', False)
order_obj = self.pool.get('pos.order')
lines_obj = self.pool.get('pos.order.line')
picking_obj = self.pool.get('stock.picking')
stock_move_obj = self.pool.get('stock.move')
move_obj = self.pool.get('stock.move')
- property_obj= self.pool.get("ir.property")
+ property_obj= self.pool.get("ir.property")
invoice_obj=self.pool.get('account.invoice')
picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', active_ids), ('state', '=', 'done')])
clone_list = []
@@ -330,19 +333,20 @@
res=cr.fetchone()
location_id=res and res[0] or None
stock_dest_id = val.id
-
+
order_obj.write(cr,uid,[order_id.id],{'type_rec':'Exchange'})
if order_id.invoice_id:
invoice_obj.refund(cr, uid, [order_id.invoice_id.id], time.strftime('%Y-%m-%d'), False, order_id.name)
- new_picking=picking_obj.create(cr, uid,{
- 'name':'%s (return)' %order_id.name,
- 'move_lines':[], 'state':'draft',
- 'type':'in',
- 'date':date_cur})
+ new_picking=picking_obj.create(cr, uid, {
+ 'name':'%s (return)' %order_id.name,
+ 'move_lines':[], 'state':'draft',
+ 'type':'in',
+ 'date':date_cur
+ })
for line in order_id.lines:
key=('return%s') %line.id
if line.id and data.has_key(key):
- new_move=stock_move_obj.create(cr, uid,{
+ new_move=stock_move_obj.create(cr, uid, {
'product_qty': data['return%s' %line.id ],
'product_uos_qty': uom_obj._compute_qty(cr, uid, data['return%s' %line.id], line.product_id.uom_id.id),
'picking_id':new_picking,
@@ -352,29 +356,30 @@
'location_dest_id':stock_dest_id,
'name':'%s (return)' %order_id.name,
'date':date_cur,
- 'date_planned':date_cur,})
- lines_obj.write(cr,uid,[line.id],{'qty_rfd':(line.qty or 0.0) + data['return%s' %line.id],
- 'qty':line.qty-(data['return%s' %line.id] or 0.0)
+ 'date_planned':date_cur
})
+ lines_obj.write(cr,uid,[line.id], {
+ 'qty_rfd':(line.qty or 0.0) + data['return%s' %line.id],
+ 'qty':line.qty-(data['return%s' %line.id] or 0.0)
+ })
wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
picking_obj.force_assign(cr, uid, [new_picking], context)
- obj=order_obj.browse(cr,uid, active_ids[0])
- context.update({'return':'return'})
-
+ obj=order_obj.browse(cr,uid, active_ids[0])
+ context.update({'return':'return'})
+
if obj.amount_total != obj.amount_paid:
return {
- 'name': _('Make Payment'),
- 'context ':context,
- 'view_type': 'form',
- 'view_mode': 'form',
- 'res_model': 'pos.make.payment',
- 'view_id': False,
- 'target': 'new',
- 'views': False,
- 'type': 'ir.actions.act_window',
-
+ 'name': _('Make Payment'),
+ 'context ':context,
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'pos.make.payment',
+ 'view_id': False,
+ 'target': 'new',
+ 'views': False,
+ 'type': 'ir.actions.act_window',
}
- return True
-
-add_product()
+ return True
+
+add_product()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'point_of_sale/wizard/pos_sales_user.xml'
--- point_of_sale/wizard/pos_sales_user.xml 2010-04-01 05:53:04 +0000
+++ point_of_sale/wizard/pos_sales_user.xml 2010-08-13 13:36:19 +0000
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
- <data>
+ <data>
<!-- pos sales user -->
-
+
<record id="view_pos_sale_user" model="ir.ui.view">
<field name="name">Sale By User</field>
<field name="model">pos.sale.user</field>
@@ -31,13 +31,6 @@
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
-<!-- <act_window name="POS Details"
- res_model="pos.details"
- src_model="pos.order"
- view_mode="form"
- target="new"
- key2="client_action_multi"
- id="action_report_pos_details"/> -->
-
+
</data>
-</openerp>
\ No newline at end of file
+</openerp>
\ No newline at end of file
=== modified file 'process/__openerp__.py'
--- process/__openerp__.py 2010-07-28 11:43:44 +0000
+++ process/__openerp__.py 2010-08-13 13:36:19 +0000
@@ -37,7 +37,10 @@
'website': 'http://www.openerp.com',
'depends': ['base'],
'init_xml': [],
- 'update_xml': ['security/ir.model.access.csv', 'process_view.xml'],
+ 'update_xml': [
+ 'security/ir.model.access.csv',
+ 'process_view.xml'
+ ],
'demo_xml': [],
'installable': True,
'active': False,
=== modified file 'process/process.py'
--- process/process.py 2010-05-19 18:32:32 +0000
+++ process/process.py 2010-08-13 13:36:19 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -25,22 +25,22 @@
from osv import fields, osv
class Env(dict):
-
+
def __init__(self, obj, user):
self.__obj = obj
self.__usr = user
-
+
def __getitem__(self, name):
-
+
if name in ('__obj', '__user'):
return super(ExprContext, self).__getitem__(name)
-
+
if name == 'user':
return self.__user
-
+
if name == 'object':
return self.__obj
-
+
return self.__obj[name]
class process_process(osv.osv):
@@ -85,7 +85,7 @@
def graph_get(self, cr, uid, id, res_model, res_id, scale, context):
pool = pooler.get_pool(cr.dbname)
-
+
process = pool.get('process.process').browse(cr, uid, [id], context)[0]
name = process.name
@@ -135,7 +135,7 @@
if node.menu_id:
data['menu'] = {'name': node.menu_id.complete_name, 'id': node.menu_id.id}
-
+
if node.model_id and node.model_id.model == res_model:
try:
data['active'] = eval(node.model_states, expr_context)
@@ -233,7 +233,7 @@
# calculate graph layout
g = tools.graph(nodes.keys(), map(lambda x: (x['source'], x['target']), transitions.values()))
- g.process(start)
+ g.process(start)
g.scale(*scale) #g.scale(100, 100, 180, 120)
graph = g.result_get()
=== modified file 'procurement/company.py'
--- procurement/company.py 2010-07-08 06:58:43 +0000
+++ procurement/company.py 2010-08-13 13:36:19 +0000
@@ -28,10 +28,10 @@
help="This is the time frame analysed by the scheduler when "\
"computing procurements. All procurements that are not between "\
"today and today+range are skipped for futur computation."),
- }
+ }
_defaults = {
'schedule_range': 80.0,
- }
+ }
company()
=== modified file 'procurement/procurement_view.xml'
--- procurement/procurement_view.xml 2010-08-12 14:31:06 +0000
+++ procurement/procurement_view.xml 2010-08-13 13:36:19 +0000
@@ -263,12 +263,5 @@
res_model="stock.warehouse.orderpoint"
src_model="procurement.order"/>
-<!-- <act_window-->
-<!-- domain="[('id', '=', product_id)]"-->
-<!-- id="act_product_product_2_stock_warehouse_orderpoint"-->
-<!-- name="Product"-->
-<!-- res_model="product.product"-->
-<!-- src_model="procurement.order"/>-->
-
</data>
</openerp>
=== modified file 'procurement/schedulers.py'
--- procurement/schedulers.py 2010-07-09 14:03:17 +0000
+++ procurement/schedulers.py 2010-08-13 13:36:19 +0000
@@ -259,7 +259,7 @@
'act_from': user_id,
'act_to': user_id,
'body': '\n'.join(report)
- })
+ })
if use_new_cursor:
cr.commit()
cr.close()
=== modified file 'procurement/wizard/make_procurement_product.py'
--- procurement/wizard/make_procurement_product.py 2010-05-27 12:47:06 +0000
+++ procurement/wizard/make_procurement_product.py 2010-08-13 13:36:19 +0000
@@ -47,27 +47,27 @@
'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True),
'date_planned': fields.date('Planned Date', required=True),
}
-
+
_defaults = {
- 'date_planned': lambda *args: time.strftime('%Y-%m-%d'),
- 'qty': lambda *args: 1.0,
+ 'date_planned': lambda *args: time.strftime('%Y-%m-%d'),
+ 'qty': lambda *args: 1.0,
}
-
+
def make_procurement(self, cr, uid, ids, context=None):
""" Creates procurement order for selected product.
@param self: The object pointer.
@param cr: A database cursor
@param uid: ID of the user currently logged in
- @param ids: List of IDs selected
- @param context: A standard dictionary
- @return: A dictionary which loads Procurement form view.
+ @param ids: List of IDs selected
+ @param context: A standard dictionary
+ @return: A dictionary which loads Procurement form view.
"""
user = self.pool.get('res.users').browse(cr, uid, uid, context).login
wh_obj = self.pool.get('stock.warehouse')
- procurement_obj = self.pool.get('procurement.order')
+ procurement_obj = self.pool.get('procurement.order')
wf_service = netsvc.LocalService("workflow")
data_obj = self.pool.get('ir.model.data')
-
+
for proc in self.browse(cr, uid, ids):
wh = wh_obj.browse(cr, uid, proc.warehouse_id.id, context)
procure_id = procurement_obj.create(cr, uid, {
@@ -79,42 +79,42 @@
'location_id': wh.lot_stock_id.id,
'procure_method':'make_to_order',
})
-
+
wf_service.trg_validate(uid, 'procurement.order', procure_id, 'button_confirm', cr)
-
-
+
+
id2 = data_obj._get_id(cr, uid, 'procurement', 'procurement_tree_view')
id3 = data_obj._get_id(cr, uid, 'procurement', 'procurement_form_view')
-
+
if id2:
id2 = data_obj.browse(cr, uid, id2, context=context).res_id
if id3:
id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
+
return {
- 'view_type': 'form',
- 'view_mode': 'tree,form',
- 'res_model': 'procurement.order',
- 'res_id' : procure_id,
- 'views': [(id3,'form'),(id2,'tree')],
- 'type': 'ir.actions.act_window',
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'res_model': 'procurement.order',
+ 'res_id' : procure_id,
+ 'views': [(id3,'form'),(id2,'tree')],
+ 'type': 'ir.actions.act_window',
}
-
+
def default_get(self, cr, uid, fields, context=None):
""" To get default values for the object.
@param self: The object pointer.
@param cr: A database cursor
@param uid: ID of the user currently logged in
- @param fields: List of fields for which we want default values
- @param context: A standard dictionary
- @return: A dictionary which of fields with values.
+ @param fields: List of fields for which we want default values
+ @param context: A standard dictionary
+ @return: A dictionary which of fields with values.
"""
record_id = context and context.get('active_id', False) or False
res = super(make_procurement, self).default_get(cr, uid, fields, context=context)
product_id = self.pool.get('product.product').browse(cr, uid, record_id, context=context).id
if 'product_id' in fields:
- res.update({'product_id':product_id})
+ res.update({'product_id':product_id})
return res
make_procurement()
=== modified file 'procurement/wizard/mrp_procurement.py'
--- procurement/wizard/mrp_procurement.py 2010-06-14 10:28:26 +0000
+++ procurement/wizard/mrp_procurement.py 2010-08-13 13:36:19 +0000
@@ -25,28 +25,27 @@
class procurement_compute(osv.osv_memory):
_name = 'procurement.order.compute'
_description = 'Compute Procurement'
-
+
def _procure_calculation_procure(self, cr, uid, ids, context):
try:
proc_obj = self.pool.get('procurement.order')
proc_obj._procure_confirm(cr, uid, use_new_cursor=cr.dbname, context=context)
finally:
pass
- #cr.close()
return {}
-
+
def procure_calculation(self, cr, uid, ids, context):
- """
+ """
@param self: The object pointer.
@param cr: A database cursor
@param uid: ID of the user currently logged in
- @param ids: List of IDs selected
- @param context: A standard dictionary
+ @param ids: List of IDs selected
+ @param context: A standard dictionary
"""
threaded_calculation = threading.Thread(target=self._procure_calculation_procure, args=(cr, uid, ids, context))
threaded_calculation.start()
return {}
-
+
procurement_compute()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'procurement/wizard/mrp_procurement_view.xml'
--- procurement/wizard/mrp_procurement_view.xml 2010-05-27 12:47:06 +0000
+++ procurement/wizard/mrp_procurement_view.xml 2010-08-13 13:36:19 +0000
@@ -22,13 +22,5 @@
</field>
</record>
-<!-- <act_window name="Compute Procurements" -->
-<!-- res_model="procurement.order.compute"-->
-<!-- src_model="procurement.order"-->
-<!-- view_mode="form"-->
-<!-- target="new" -->
-<!-- key2="client_action_multi" -->
-<!-- id="act_compute_procurement"/> -->
-
</data>
-</openerp>
+</openerp>
=== modified file 'procurement/wizard/schedulers_all.py'
--- procurement/wizard/schedulers_all.py 2010-06-30 10:31:08 +0000
+++ procurement/wizard/schedulers_all.py 2010-08-13 13:36:19 +0000
@@ -31,7 +31,7 @@
'automatic': fields.boolean('Automatic orderpoint',help='Triggers an automatic procurement for all products that have a virtual stock under 0. You should probably not use this option, we suggest using a MTO configuration on products.'),
}
- _defaults ={
+ _defaults = {
'automatic': lambda *a: False,
}
=== modified file 'product/pricelist.py'
--- product/pricelist.py 2010-06-16 11:51:39 +0000
+++ product/pricelist.py 2010-08-13 13:36:19 +0000
@@ -21,7 +21,6 @@
from osv import fields, osv
-#from tools.misc import currency
from _common import rounding
import time
from tools import config
@@ -64,7 +63,7 @@
"active": lambda *args: True,
"currency_id": _get_currency
}
-
+
price_type()
#----------------------------------------------------------
@@ -93,8 +92,7 @@
res.append((type['key'],type['name']))
return res
-# cr.execute('select key,name from product_pricelist_type order by name')
-# return cr.fetchall()
+
_name = "product.pricelist"
_description = "Pricelist"
_columns = {
=== modified file 'product/process/product_process.xml'
--- product/process/product_process.xml 2010-04-29 08:01:54 +0000
+++ product/process/product_process.xml 2010-08-13 13:36:19 +0000
@@ -17,7 +17,6 @@
-->
<record id="process_node_product0" model="process.node">
-<!-- <field name="menu_id" ref="product.menu_products"/>-->
<field name="model_id" ref="product.model_product_product"/>
<field eval=""""state"""" name="kind"/>
<field eval=""""Product"""" name="name"/>
@@ -28,7 +27,6 @@
</record>
<record id="process_node_supplier0" model="process.node">
-<!-- <field name="menu_id" ref="product.menu_products"/>-->
<field name="model_id" ref="product.model_product_supplierinfo"/>
<field eval=""""state"""" name="kind"/>
<field eval=""""Supplier Information"""" name="name"/>
=== modified file 'product/product.py'
--- product/product.py 2010-08-12 19:29:33 +0000
+++ product/product.py 2010-08-13 13:36:19 +0000
@@ -289,7 +289,6 @@
_defaults = {
'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'product.template', context=c),
-# 'company_id': lambda self, cr, uid, context: False, # Visible by all
'type': lambda *a: 'product',
'list_price': lambda *a: 1,
'cost_method': lambda *a: 'standard',
@@ -476,8 +475,6 @@
if not len(ids):
return []
def _name_get(d):
- #name = self._product_partner_ref(cr, user, [d['id']], '', '', context)[d['id']]
- #code = self._product_code(cr, user, [d['id']], '', '', context)[d['id']]
name = d.get('name','')
code = d.get('default_code',False)
if code:
=== modified file 'product/product_view.xml'
--- product/product_view.xml 2010-08-10 13:45:29 +0000
+++ product/product_view.xml 2010-08-13 13:36:19 +0000
@@ -638,10 +638,6 @@
<field name="user_id" ref="base.user_root"/>
<field name="res_id" ref="product.menu_products"/>
</record>
- <!--
- <menuitem action="product_template_action_tree" id="menu_templates" parent="product.menu_products" sequence="2"
- groups="product.group_product_variant" />
- -->
</data>
</openerp>
=== modified file 'product/report/pricelist.py'
--- product/report/pricelist.py 2010-06-16 11:51:39 +0000
+++ product/report/pricelist.py 2010-08-13 13:36:19 +0000
@@ -96,14 +96,11 @@
else:
res = pool.get('product.product').read(cr, uid, [x['id']])
price = res[0]['list_price']
-# temp.append('<price name="%s %s" />'%(price_list[i][x['id']]*q[2]['name'],currency['currency_id'][1]))
temp.append('<price name="%.2f" />'%(price))
i+=1
pro.extend(temp)
pro.append('</pro>')
-# categ.extend(pro)
-# categ.append('</categ>')
product_xml.extend(pro)
product_xml.append('</product>')
=== modified file 'product/report/product_pricelist.py'
--- product/report/product_pricelist.py 2010-07-23 14:19:46 +0000
+++ product/report/product_pricelist.py 2010-08-13 13:36:19 +0000
@@ -44,7 +44,6 @@
qtys = 1
for i in range(1,6):
-# if form['qty'+str(i)] > 0 and form['qty'+str(i)] not in vals.values():
vals['qty'+str(qtys)] = form['qty'+str(i)]
qtys += 1
lst.append(vals)
@@ -85,11 +84,11 @@
product_ids=pool.get('product.product').search(self.cr, self.uid, [('id','in',pro_ids),('categ_id','=',cat['id'])])
products = []
for product in pool.get('product.product').read(self.cr, self.uid, product_ids, ['name','code']):
- val={
- 'id':product['id'],
- 'name':product['name'],
- 'code':product['code']
- }
+ val = {
+ 'id':product['id'],
+ 'name':product['name'],
+ 'code':product['code']
+ }
i = 1
for qty in self.quantity:
if qty == 0:
=== modified file 'product_manufacturer/__openerp__.py'
--- product_manufacturer/__openerp__.py 2010-06-14 06:50:20 +0000
+++ product_manufacturer/__openerp__.py 2010-08-13 13:36:19 +0000
@@ -1,5 +1,5 @@
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@@ -14,7 +14,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
{
@@ -26,7 +26,10 @@
"init_xml" : [],
"demo_xml" : [],
"description": "A module that add manufacturers and attributes on the product form",
- "update_xml" : ["security/ir.model.access.csv","product_manufacturer_view.xml"],
+ "update_xml" : [
+ "security/ir.model.access.csv",
+ "product_manufacturer_view.xml"
+ ],
"active": False,
"installable": True
}
=== modified file 'product_margin/__openerp__.py'
--- product_margin/__openerp__.py 2010-07-28 11:43:44 +0000
+++ product_margin/__openerp__.py 2010-08-13 13:36:19 +0000
@@ -34,7 +34,8 @@
'update_xml': [
'security/ir.model.access.csv',
'wizard/product_margin_view.xml',
- 'product_margin_view.xml'],
+ 'product_margin_view.xml'
+ ],
'demo_xml': [],
'installable': True,
'active': False,
=== modified file 'product_visible_discount/product.py'
--- product_visible_discount/product.py 2010-06-30 10:31:08 +0000
+++ product_visible_discount/product.py 2010-08-13 13:36:19 +0000
@@ -81,19 +81,12 @@
return res
product = product_obj.browse(cr, uid, product, context)
-# product_tmpl_id = product.product_tmpl_id.id
-# pricetype_id = pricelist_obj.browse(cr, uid, pricelist).version_id[0].items_id[0].base
-# field_name = 'list_price'
-# product_read = self.pool.get('product.template').read(cr, uid, product_tmpl_id, [field_name], context)
-# list_price = product_read[field_name]
list_price = pricelist_obj.price_get(cr, uid, [pricelist],
product.id, qty or 1.0, partner_id, {'uom': uom,'date': date_order })
pricelists = pricelist_obj.read(cr,uid,[pricelist],['visible_discount'])
old_uom = product.uos_id or product.uom_id
-# new_list_price = product_uom_obj._compute_price(cr,
-# uid, old_uom.id, list_price, uom)
new_list_price = get_real_price(list_price, product.id, pricelist)
if(len(pricelists)>0 and pricelists[0]['visible_discount'] and list_price[pricelist] != 0):
discount = (new_list_price - price) / new_list_price * 100
=== modified file 'profile_tools/installer.py'
--- profile_tools/installer.py 2010-08-13 05:26:43 +0000
+++ profile_tools/installer.py 2010-08-13 13:36:19 +0000
@@ -25,15 +25,14 @@
_inherit = 'res.config.installer'
_columns = {
- # Tools
'lunch':fields.boolean('Lunch Orders',help='Installs tools for lunch module'),
'subscription':fields.boolean('Recurring Documents',help='Installs tools for subscription module'),
'survey':fields.boolean('Survey',help='Installs tools for survey module'),
'audittrail':fields.boolean('Audit Trail',help='Installs tools for audittrail module'),
- }
+ }
_defaults = {
'lunch': True,
- }
-
+ }
+
misc_tools_installer()
=== modified file 'project/__openerp__.py'
--- project/__openerp__.py 2010-08-10 10:32:59 +0000
+++ project/__openerp__.py 2010-08-13 13:36:19 +0000
@@ -55,9 +55,9 @@
'board_project_demo.xml',
],
'test':[
- 'test/test_project.yml',
- 'test/test_project_delegation.yml',
- ],
+ 'test/test_project.yml',
+ 'test/test_project_delegation.yml',
+ ],
'installable': True,
'active': False,
'certificate': '0075116868317',
=== modified file 'project/board_project_demo.xml'
--- project/board_project_demo.xml 2010-07-10 05:10:43 +0000
+++ project/board_project_demo.xml 2010-08-13 13:36:19 +0000
@@ -1,28 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
-
+
<!--
Administrator shortcut
Demo user startup menu
-->
- <!--record id="sc_account_dash" model="ir.ui.view_sc">
- <field name="name">project dashboard</field>
- <field name="user_id" ref="base.user_demo"/>
- <field name="resource">ir.ui.menu</field>
- <field name="sequence">3</field>
- <field name="res_id" ref="menu_board_project"/>
- </record-->
-
<record id="base.user_root" model="res.users">
<field name="action_id" ref="open_board_project"/>
</record>
-
+
<record id="note_project" model="board.note">
<field name="name">Don't forget the new development policies.</field>
<field name="user_id" ref="base.user_root"/>
<field name="type">Project</field>
</record>
-
+
</data>
</openerp>
=== modified file 'project/board_project_view.xml'
--- project/board_project_view.xml 2010-07-26 05:56:23 +0000
+++ project/board_project_view.xml 2010-08-13 13:36:19 +0000
@@ -89,15 +89,6 @@
<field name="view_id" ref="project.view_project_message_tree"/>
</record>
-<!-- <record id="action_view_project_member_tree" model="ir.actions.act_window">
- <field name="name">Project's Members</field>
- <field name="res_model">resource.resource</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="domain">[('resource_type','=','user')]</field>
- <field name="view_id" ref="resource.resource_resource_tree"/>
- </record>-->
-
<record id="board_project_form" model="ir.ui.view">
<field name="name">board.project.form</field>
<field name="model">board.board</field>
=== modified file 'project/installer.py'
--- project/installer.py 2010-07-09 07:27:50 +0000
+++ project/installer.py 2010-08-13 13:36:19 +0000
@@ -54,11 +54,11 @@
help="Embeds the 'Getting Things Done concepts' into OpenERP's "
"project management."),
}
-
+
_defaults={
- 'project_crm': True,
- }
-
+ 'project_crm': True,
+ }
+
project_installer()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
=== modified file 'project/project.py'
--- project/project.py 2010-08-13 05:07:55 +0000
+++ project/project.py 2010-08-13 13:36:19 +0000
@@ -298,7 +298,7 @@
'type': 'ir.actions.act_window',
'search_view_id': search_view['res_id'],
'nodestroy': True
- }
+ }
# set active value for a project, its sub projects and its tasks
def setActive(self, cr, uid, ids, value=True, context=None):
@@ -373,10 +373,6 @@
return int(context['project_id'])
return False
- #_sql_constraints = [
- # ('remaining_hours', 'CHECK (remaining_hours>=0)', 'Please increase and review remaining hours ! It can not be smaller than 0.'),
- #]
-
def copy_data(self, cr, uid, id, default={}, context=None):
default = default or {}
default.update({'work_ids':[], 'date_start': False, 'date_end': False, 'date_deadline': False})
@@ -532,7 +528,7 @@
'type': 'ir.actions.act_window',
'target': 'new',
'nodestroy': True
- }
+ }
else:
self.write(cr, uid, [task_id], {'state': 'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
return False
@@ -755,8 +751,8 @@
})
task_obj.write(cr, uid, [task.id], {'state': 'open'})
return {
- 'type': 'ir.actions.act_window_close',
- }
+ 'type': 'ir.actions.act_window_close',
+ }
config_compute_remaining()
=== modified file 'project/project_view.xml'
--- project/project_view.xml 2010-08-13 05:07:55 +0000
+++ project/project_view.xml 2010-08-13 13:36:19 +0000
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
-
+
<menuitem
icon="terp-project" id="base.menu_main_pm"
name="Project" sequence="10"
@@ -159,8 +159,6 @@
<field name="domain">[('state','=','template')]</field>
<field name="view_id" ref="view_project"/>
</record>
-<!-- <menuitem id="menu_template_project_specification" parent="project.menu_definitions" name="Specification" sequence="1"/>-->
-<!-- <menuitem action="open_view_template_project" id="menu_template_project" parent="project.menu_template_project_specification" name="Specification Template"/>-->
<record id="view_task_work_form" model="ir.ui.view">
<field name="name">project.task.work.form</field>
@@ -402,7 +400,7 @@
<filter string="In Progress" domain="[('state','=','open')]" help="Open Tasks" icon="terp-camera_test"/>
<filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
<separator orientation="vertical"/>
- <filter name="edit"
+ <filter name="edit"
string="Edit" context="{'set_editable':True,'seq_visible': True}"
icon="gtk-execute"
groups="base.group_extended"/>
@@ -642,6 +640,6 @@
<act_window domain="[('user_id', '=', active_id),('date', '>=', time.strftime('%Y-%m-01'))]" id="act_res_users_2_project_task_work_month" name="Month works" res_model="project.task.work" src_model="res.users" view_mode="tree,form" view_type="form"/>
<act_window domain="[('project_id', '=', active_id)]" id="act_project_messages" name="Messages" res_model="project.message" src_model="project.project"/>
-
+
</data>
</openerp>
=== modified file 'project/wizard/project_close_task.py'
--- project/wizard/project_close_task.py 2010-08-10 10:32:59 +0000
+++ project/wizard/project_close_task.py 2010-08-13 13:36:19 +0000
@@ -35,7 +35,7 @@
'manager_email': fields.char('Manager E-Mail ID', size=64, help="Email Address of Project's Manager"),
'partner_email': fields.char('Partner E-Mail ID', size=64, help="Email Address of Partner"),
'description': fields.text('Description'),
- }
+ }
def _get_manager_email(self, cr, uid, context=None):
if context is None:
@@ -48,7 +48,7 @@
if manager_id and manager_id.user_email:
email = manager_id.user_email
return email
-
+
def _get_partner_email(self, cr, uid, context=None):
if context is None:
context = {}
@@ -72,8 +72,8 @@
'manager_email': _get_manager_email,
'partner_email': _get_partner_email,
'description': _get_desc,
- }
-
+ }
+
def close(self, cr, uid, ids, context=None):
if 'task_id' in context:
self.pool.get('project.task').write(cr, uid, [context['task_id']], {'state': 'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
@@ -87,14 +87,14 @@
close_task = self.read(cr, uid, ids[0], [])
to_adr = []
description = close_task['description']
-
+
if 'task_id' in context:
if context.get('send_manager', False) and not close_task.get('manager_email', False):
raise osv.except_osv(_('Error'), _("Please specify the email address of Project Manager."))
-
+
elif context.get('send_partner', False) and not close_task.get('partner_email', False):
raise osv.except_osv(_('Error'), _("Please specify the email address of partner."))
-
+
else:
task_obj = self.pool.get('project.task')
task = task_obj.browse(cr, uid, context['task_id'], context=context)
@@ -112,8 +112,8 @@
'date_start': task.date_start,
'date_end': task.date_end,
'state': task.state
- }
-
+ }
+
header = (project.warn_header or '') % val
footer = (project.warn_footer or '') % val
body = u'%s\n%s\n%s\n\n-- \n%s' % (header, description, footer, signature)
@@ -123,7 +123,7 @@
task_obj.write(cr, uid, [task.id], {'state': 'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
message = _('Task ') + " '" + task.name + "' "+ _("is Done.")
self.log(cr, uid, task.id, message)
-
+
return {}
project_close_task()
=== modified file 'project/wizard/project_task_delegate.py'
--- project/wizard/project_task_delegate.py 2010-08-10 10:32:59 +0000
+++ project/wizard/project_task_delegate.py 2010-08-13 13:36:19 +0000
@@ -35,7 +35,8 @@
'new_task_description': fields.text('New Task Description', help="Reinclude the description of the task in the task of the user"),
'planned_hours': fields.float('Planned Hours', help="Estimated time to close this task by the delegated user"),
'planned_hours_me': fields.float('Hours to Validate', required=True, help="Estimated time for you to validate the work done by the user to whom you delegate this task"),
- 'state': fields.selection([('pending','Pending'), ('done','Done'), ], 'Validation State', required=True, help="New state of your own task. Pending will be reopened automatically when the delegated task is closed"), }
+ 'state': fields.selection([('pending','Pending'), ('done','Done'), ], 'Validation State', required=True, help="New state of your own task. Pending will be reopened automatically when the delegated task is closed")
+ }
def _get_name(self, cr, uid, context=None):
if context is None:
@@ -85,7 +86,7 @@
'new_task_description': _get_new_desc,
'state': 'pending',
}
-
+
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
users_obj = self.pool.get('res.users')
obj_tm = users_obj.browse(cr, uid, uid, context).company_id.project_time_mode_id
@@ -114,7 +115,7 @@
res['fields'][f]['string'] = res['fields'][f]['string'].replace('Hours',tm)
return res
-
+
def validate(self, cr, uid, ids, context=None):
if context is None:
context = {}
=== modified file 'project_caldav/project_caldav_data.xml'
--- project_caldav/project_caldav_data.xml 2010-07-29 13:39:38 +0000
+++ project_caldav/project_caldav_data.xml 2010-08-13 13:36:19 +0000
@@ -1,20 +1,20 @@
<?xml version="1.0"?>
<openerp>
- <data noupdate="1">
+ <data noupdate="1">
<record model="basic.calendar" id="caldav.basic_calendar2">
<field name="name">Tasks</field>
<field name="collection_id" ref="document.dir_calendars"></field>
<field name="type">vtodo</field>
</record>
-
+
<record model="basic.calendar.lines" id="caldav.calendar_lines_todo">
<field name="name">vtodo</field>
<field name="calendar_id" ref="caldav.basic_calendar2" />
<field name="object_id" search="[('model','=','project.task')]" />
<field name="domain">[('user_id','=', uid)]</field>
- </record>
-
+ </record>
+
<record model="basic.calendar.fields" id="map_todo_1">
<field name="name" ref="caldav.field_todo_status" />
<field name="type_id" ref="caldav.calendar_lines_todo" />
@@ -51,18 +51,6 @@
<field name="fn">field</field>
</record>
- <!-- Sequence is not impemented right.
- See http://tools.ietf.org/html/rfc5545#section-3.8.7.4
- Disabling..
-
- <record model="basic.calendar.fields" id="map_todo_6">
- <field name="name" ref="caldav.field_todo_seq"/>
- <field name="type_id" ref="caldav.calendar_lines_todo" />
- <field name="field_id" search="[('name','=','sequence'),('model_id.model','=','calendar.todo')]" />
- <field name="fn">field</field>
- </record>
- -->
-
<record model="basic.calendar.fields" id="map_todo_7">
<field name="name" ref="caldav.field_todo_url"/>
<field name="type_id" ref="caldav.calendar_lines_todo" />
@@ -76,15 +64,15 @@
<field name="field_id" search="[('name','=','progress'),('model_id.model','=','project.task')]" />
<field name="fn">field</field>
</record>
-
-
+
+
<record model="basic.calendar.fields" id="map_todo_10">
<field name="name" ref="caldav.field_todo_vtimezone"/>
<field name="type_id" ref="caldav.calendar_lines_todo" />
<field name="field_id" search="[('name','=','vtimezone'),('model_id.model','=','calendar.todo')]" />
<field name="fn">field</field>
</record>
-
+
<record model="basic.calendar.fields" id="map_todo_11">
<field name="name" ref="caldav.field_todo_summary"/>
<field name="type_id" ref="caldav.calendar_lines_todo" />
@@ -147,20 +135,20 @@
<field name="type_id" ref="caldav.calendar_lines_todo" />
<field name="field_id" search="[('name','=','id'),('model_id.model','=','calendar.todo')]" />
<field name="fn">field</field>
- </record>
-
+ </record>
+
<record model="basic.calendar.lines" id="caldav.calendar_lines_alarm2">
<field name="name">valarm</field>
<field name="calendar_id" ref="caldav.basic_calendar2" />
<field name="object_id" search="[('model','=','calendar.alarm')]" />
</record>
-
+
<record model="basic.calendar.lines" id="caldav.calendar_lines_attendee2">
<field name="name">attendee</field>
<field name="calendar_id" ref="caldav.basic_calendar2" />
<field name="object_id" search="[('model','=','calendar.attendee')]" />
</record>
-
+
<record model="basic.calendar.fields" id="map_alarm_1">
<field name="name" ref="caldav.field_alarm_attendee"/>
@@ -316,6 +304,6 @@
<field name="field_id" search="[('name','=','rsvp'),('model_id.model','=','calendar.attendee')]" />
<field name="fn">field</field>
</record>
-
+
</data>
</openerp>
=== modified file 'project_gtd/__openerp__.py'
--- project_gtd/__openerp__.py 2010-07-28 11:43:44 +0000
+++ project_gtd/__openerp__.py 2010-08-13 13:36:19 +0000
@@ -49,8 +49,8 @@
],
'demo_xml': ['project_gtd_demo.xml'],
'test':[
- 'test/gtd_test.yml'
- ],
+ 'test/gtd_test.yml'
+ ],
'installable': True,
'active': False,
'certificate': '0043525236301',
=== modified file 'project_gtd/project_gtd_view.xml'
--- project_gtd/project_gtd_view.xml 2010-08-06 11:29:15 +0000
+++ project_gtd/project_gtd_view.xml 2010-08-13 13:36:19 +0000
@@ -30,8 +30,7 @@
<field name="res_model">project.gtd.context</field>
</record>
-<!-- <menuitem name="Time Management" id="menu_open_gtd_time" parent="project.menu_definitions" groups="group_project_getting"/>-->
- <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting,base.group_system"
+ <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting,base.group_system"
parent="project.menu_tasks_config" action="open_gtd_context_tree"/>
<record model="ir.ui.view" id="view_gtd_timebox_tree">
@@ -98,6 +97,6 @@
</field>
</field>
</record>
-
+
</data>
</openerp>
=== modified file 'project_gtd/wizard/project_gtd_empty.py'
--- project_gtd/wizard/project_gtd_empty.py 2010-08-12 07:31:45 +0000
+++ project_gtd/wizard/project_gtd_empty.py 2010-08-13 13:36:19 +0000
@@ -28,7 +28,7 @@
_description = 'Project Timebox Empty'
_columns = {
'name': fields.char('Name', size=32)
- }
+ }
def view_init(self, cr , uid , fields_list, context=None):
if context is None:
=== modified file 'project_gtd/wizard/project_gtd_fill.py'
--- project_gtd/wizard/project_gtd_fill.py 2010-07-02 14:37:06 +0000
+++ project_gtd/wizard/project_gtd_fill.py 2010-08-13 13:36:19 +0000
@@ -29,7 +29,7 @@
'timebox_id': fields.many2one('project.gtd.timebox', 'Get from Timebox', required=True),
'timebox_to_id': fields.many2one('project.gtd.timebox', 'Set to Timebox', required=True),
'task_ids': fields.many2many('project.task', 'project_task_rel', 'task_id', 'fill_id', 'Tasks selection')
- }
+ }
def _get_from_tb(self, cr, uid, context=None):
if context is None:
@@ -47,7 +47,7 @@
_defaults = {
'timebox_id': _get_from_tb,
'timebox_to_id': _get_to_tb,
- }
+ }
def process(self, cr, uid, ids, context=None):
if context is None:
=== modified file 'project_issue/__openerp__.py'
--- project_issue/__openerp__.py 2010-08-12 07:31:45 +0000
+++ project_issue/__openerp__.py 2010-08-13 13:36:19 +0000
@@ -49,7 +49,7 @@
'test': [
'test/convert_issue_to_task.yml',
'test/test_project_issue_states.yml'
- ],
+ ],
'installable': True,
'active': False,
}
=== modified file 'project_issue/project_issue_menu.xml'
--- project_issue/project_issue_menu.xml 2010-07-02 14:37:06 +0000
+++ project_issue/project_issue_menu.xml 2010-08-13 13:36:19 +0000
@@ -47,8 +47,7 @@
view_mode="tree,form,calendar,graph"
view_type="form"/>
- <!--<menuitem id="menu_aftertask" name="Bug" parent="project.menu_main" visible="False"/>-->
- <menuitem name="Issues" id="menu_project_issue_track" parent="project.menu_project_management"
+ <menuitem name="Issues" id="menu_project_issue_track" parent="project.menu_project_management"
action="project_issue_categ_act0" sequence="3"/>
</data>
</openerp>
=== modified file 'project_issue_sheet/__openerp__.py'
--- project_issue_sheet/__openerp__.py 2010-08-12 07:31:45 +0000
+++ project_issue_sheet/__openerp__.py 2010-08-13 13:36:19 +0000
@@ -24,7 +24,7 @@
'name': 'Add the Timesheet support for Issue Management in Project Management',
'version': '1.0',
'category': 'Generic Modules/CRM & SRM',
- 'description': """
+ 'description': """
This module adds the Timesheet support for the Issues/Bugs Management in Project
""",
'author': 'OpenERP SA',
@@ -32,14 +32,14 @@
'depends': [
'project_issue',
'hr_timesheet_sheet',
- ],
+ ],
'init_xml': [
- ],
+ ],
'update_xml': [
'project_issue_sheet_view.xml',
- ],
+ ],
'demo_xml': [
- ],
+ ],
'installable': True,
'active': False,
}
=== modified file 'project_issue_sheet/project_issue_sheet.py'
--- project_issue_sheet/project_issue_sheet.py 2010-08-03 12:38:19 +0000
+++ project_issue_sheet/project_issue_sheet.py 2010-08-13 13:36:19 +0000
@@ -29,7 +29,7 @@
'timesheet_ids': fields.one2many('hr.analytic.timesheet', 'issue_id', 'Timesheets'),
'analytic_account_id': fields.related('project_id', 'analytic_account_id', type='many2one', relation='account.analytic.account',string='Analytic Account')
}
-
+
project_issue()
class account_analytic_line(osv.osv):
@@ -37,7 +37,7 @@
_description = 'account analytic line'
_columns = {
'create_date' : fields.datetime('Create Date', readonly=True),
- }
+ }
account_analytic_line()
=== modified file 'project_long_term/__openerp__.py'
--- project_long_term/__openerp__.py 2010-08-12 07:31:45 +0000
+++ project_long_term/__openerp__.py 2010-08-13 13:36:19 +0000
@@ -40,10 +40,10 @@
"init_xml": [],
"demo_xml": ["project_long_term_demo.xml"],
"test": [
- 'test/schedule_project_phases.yml',
- 'test/schedule_project_tasks.yml',
- 'test/schedule_phase_tasks.yml'
- ],
+ 'test/schedule_project_phases.yml',
+ 'test/schedule_project_tasks.yml',
+ 'test/schedule_phase_tasks.yml'
+ ],
"update_xml": [
"security/ir.model.access.csv",
"wizard/project_schedule_tasks_view.xml",
@@ -51,7 +51,6 @@
"project_long_term_workflow.xml",
"wizard/project_compute_phases_view.xml",
"wizard/project_compute_tasks_view.xml",
-
],
'installable': True,
'active': False,
=== modified file 'project_long_term/project_long_term.py'
--- project_long_term/project_long_term.py 2010-08-12 07:31:45 +0000
+++ project_long_term/project_long_term.py 2010-08-13 13:36:19 +0000
@@ -120,8 +120,6 @@
_constraints = [
(_check_recursion,'Loops in phases not allowed',['next_phase_ids', 'previous_phase_ids']),
(_check_dates, 'Phase start-date must be lower than phase end-date.', ['date_start', 'date_end']),
- #(_check_constraint_start, 'Phase must start-after constraint start Date.', ['date_start', 'constraint_date_start']),
- #(_check_constraint_end, 'Phase must end-before constraint end Date.', ['date_end', 'constraint_date_end']),
]
def onchange_project(self, cr, uid, ids, project, context=None):
@@ -145,7 +143,6 @@
calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)])
if resource_id:
-# cal_id = resource_obj.browse(cr, uid, resource_id[0], context=context).calendar_id.id
res = resource_obj.read(cr, uid, resource_id, ['calendar_id'], context=context)[0]
cal_id = res.get('calendar_id', False) and res.get('calendar_id')[0] or False
if cal_id:
@@ -168,7 +165,6 @@
calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)], context=context)
if resource_id:
-# cal_id = resource_obj.browse(cr, uid, resource_id[0], context=context).calendar_id.id
res = resource_obj.read(cr, uid, resource_id, ['calendar_id'], context=context)[0]
cal_id = res.get('calendar_id', False) and res.get('calendar_id')[0] or False
if cal_id:
=== modified file 'project_long_term/project_long_term_view.xml'
--- project_long_term/project_long_term_view.xml 2010-08-12 07:31:45 +0000
+++ project_long_term/project_long_term_view.xml 2010-08-13 13:36:19 +0000
@@ -319,7 +319,6 @@
<menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
- <!--<menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>-->
<menuitem id="menu_pm_resources_project1"
groups="base.group_extended,base.group_system"
name="Resources" parent="project.menu_definitions" sequence="3"/>
=== modified file 'project_long_term/wizard/project_compute_phases.py'
--- project_long_term/wizard/project_compute_phases.py 2010-08-03 12:38:19 +0000
+++ project_long_term/wizard/project_compute_phases.py 2010-08-13 13:36:19 +0000
@@ -38,11 +38,11 @@
], 'Schedule', required = True),
'project_id': fields.many2one('project.project', 'Project')
- }
+ }
_defaults = {
'target_project': 'all'
- }
+ }
def check_selection(self, cr, uid, ids, context=None):
data_select = self.read(cr, uid, ids, ['target_project'])[0]
@@ -76,11 +76,11 @@
leaves = wkcal.compute_leaves(cr, uid, calendar_id , resource.id, resource.calendar_id.id)
if not phase.responsible_id:
raise osv.except_osv(_('No responsible person assigned !'),_("You must assign a responsible person for phase '%s' !") % (phase.name,))
- phase_resource_obj = classobj((phase.responsible_id.name.encode('utf8')), (Resource,),
- {'__doc__': phase.responsible_id.name,
- '__name__': phase.responsible_id.name,
- 'vacation': tuple(leaves),
- 'efficiency': time_efficiency
+ phase_resource_obj = classobj((phase.responsible_id.name.encode('utf8')), (Resource,),{
+ '__doc__': phase.responsible_id.name,
+ '__name__': phase.responsible_id.name,
+ 'vacation': tuple(leaves),
+ 'efficiency': time_efficiency
})
default_uom_id = phase_obj._get_default_uom_id(cr, uid)
avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
@@ -117,9 +117,11 @@
# Write the calculated dates back
ctx = context.copy()
ctx.update({'scheduler': True})
- phase_obj.write(cr, uid, [phase.id], {'date_start': start_date.strftime('%Y-%m-%d'),
- 'date_end': end_date.strftime('%Y-%m-%d')},
- context=ctx)
+ phase_obj.write(cr, uid, [phase.id], {
+ 'date_start': start_date.strftime('%Y-%m-%d'),
+ 'date_end': end_date.strftime('%Y-%m-%d')
+ }, context=ctx)
+
# Recursive call till all the next phases scheduled
for phase in phase.next_phase_ids:
if phase.state in ['draft', 'open', 'pending']:
=== modified file 'project_long_term/wizard/project_compute_tasks.py'
--- project_long_term/wizard/project_compute_tasks.py 2010-08-12 07:31:45 +0000
+++ project_long_term/wizard/project_compute_tasks.py 2010-08-13 13:36:19 +0000
@@ -34,7 +34,7 @@
_description = 'Project Compute Tasks'
_columns = {
'project_id': fields.many2one('project.project', 'Project', required=True)
- }
+ }
def compute_date(self, cr, uid, ids, context=None):
"""
@@ -74,11 +74,12 @@
if resource.get('calendar_id', False):
leaves = wkcal.compute_leaves(cr, uid, calendar_id , resource_id[0], resource['calendar_id'] and resource['calendar_id'][0] or False)
time_efficiency = resource.get('time_efficiency')
- resources.append(classobj((user.name.encode('utf8')), (Resource,), {'__doc__': user.name,
- '__name__': user.name,
- 'vacation': tuple(leaves),
- 'efficiency': time_efficiency
- }))
+ resources.append(classobj((user.name.encode('utf8')), (Resource,), {
+ '__doc__': user.name,
+ '__name__': user.name,
+ 'vacation': tuple(leaves),
+ 'efficiency': time_efficiency
+ }))
priority_dict = {'0': 1000, '1': 800, '2': 500, '3': 300,'4': 100}
# Create dynamic no of tasks with the resource specified
def create_tasks(j, eff, priorty=500, obj=None):
@@ -132,10 +133,12 @@
ctx = context.copy()
ctx.update({'scheduler': True})
user_id = user_obj.search(cr, uid, [('name', '=', t.booked_resource[0].__name__)])
- task_pool.write(cr, uid, [tasks[loop_no-1].id], {'date_start': s_date.strftime('%Y-%m-%d %H:%M:%S'),
- 'date_end': e_date.strftime('%Y-%m-%d %H:%M:%S'),
- 'user_id': user_id[0]},
- context=ctx)
+ task_pool.write(cr, uid, [tasks[loop_no-1].id], {
+ 'date_start': s_date.strftime('%Y-%m-%d %H:%M:%S'),
+ 'date_end': e_date.strftime('%Y-%m-%d %H:%M:%S'),
+ 'user_id': user_id[0]
+ }, context=ctx)
+
loop_no +=1
return {}
=== modified file 'project_long_term/wizard/project_schedule_tasks.py'
--- project_long_term/wizard/project_schedule_tasks.py 2010-08-12 07:31:45 +0000
+++ project_long_term/wizard/project_schedule_tasks.py 2010-08-13 13:36:19 +0000
@@ -35,10 +35,10 @@
_description = 'project.schedule.tasks'
_columns = {
'msg': fields.char('Message', size=64)
- }
+ }
_defaults = {
'msg': 'Task Scheduling Completed Successfully'
- }
+ }
def default_get(self, cr, uid, fields_list, context=None):
if context is None:
@@ -64,11 +64,11 @@
if resource_cal:
cal_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
leaves = wkcal.compute_leaves(cr, uid, cal_id, res.id, resource_cal, context=context)
- resource_objs.append(classobj(res.user_id.name.encode('utf8'), (Resource,),
- {'__doc__': res.user_id.name,
- '__name__': res.user_id.name,
- 'vacation': tuple(leaves),
- 'efficiency': resource_eff,
+ resource_objs.append(classobj(res.user_id.name.encode('utf8'), (Resource,),{
+ '__doc__': res.user_id.name,
+ '__name__': res.user_id.name,
+ 'vacation': tuple(leaves),
+ 'efficiency': resource_eff,
}))
return resource_objs
@@ -153,10 +153,12 @@
ctx = context.copy()
ctx.update({'scheduler': True})
user_id = user_obj.search(cr, uid, [('name', '=', t.booked_resource[0].__name__)])
- task_obj.write(cr, uid, [tasks[loop_no-1].id], {'date_start': s_date.strftime('%Y-%m-%d %H:%M:%S'),
- 'date_end': e_date.strftime('%Y-%m-%d %H:%M:%S'),
- 'user_id': user_id[0]},
- context=ctx)
+ task_obj.write(cr, uid, [tasks[loop_no-1].id], {
+ 'date_start': s_date.strftime('%Y-%m-%d %H:%M:%S'),
+ 'date_end': e_date.strftime('%Y-%m-%d %H:%M:%S'),
+ 'user_id': user_id[0]
+ }, context=ctx)
+
loop_no += 1
return {}
=== modified file 'project_mrp/__openerp__.py'
--- project_mrp/__openerp__.py 2010-07-28 11:43:44 +0000
+++ project_mrp/__openerp__.py 2010-08-13 13:36:19 +0000
@@ -49,8 +49,7 @@
'website': 'http://www.openerp.com',
'depends': ['project', 'procurement', 'sale', 'mrp_jit'],
'init_xml': [],
- 'update_xml': ['project_mrp_workflow.xml',
- #'process/project_mrp_process.xml',
+ 'update_xml': ['project_mrp_workflow.xml',
'project_mrp_view.xml'
],
'demo_xml': [],
=== modified file 'project_planning/__openerp__.py'
--- project_planning/__openerp__.py 2010-08-10 10:32:59 +0000
+++ project_planning/__openerp__.py 2010-08-13 13:36:19 +0000
@@ -54,8 +54,8 @@
'project_planning_demo.xml',
],
'test': [
- 'test/planning_states.yml'
- ],
+ 'test/planning_states.yml'
+ ],
'installable': True,
'active': False,
'certificate': '0034901836973',
=== modified file 'project_planning/project_planning_view.xml'
--- project_planning/project_planning_view.xml 2010-08-10 10:32:59 +0000
+++ project_planning/project_planning_view.xml 2010-08-13 13:36:19 +0000
@@ -81,8 +81,6 @@
<field name="account_id"/>
<field name="amount" />
<field name="amount_unit" />
-<!-- WIDGET MANY2MANY GIVES ERROR-->
-<!-- <field name="task_ids" colspan="4" nolabel="1" widget="many2many"/>-->
<field name="task_ids" colspan="4" nolabel="1" mode="tree,form">
<form string="Tasks">
<group colspan="4" col="2">
=== modified file 'project_scrum/wizard/project_scrum_backlog_create_task.py'
--- project_scrum/wizard/project_scrum_backlog_create_task.py 2010-07-15 05:47:56 +0000
+++ project_scrum/wizard/project_scrum_backlog_create_task.py 2010-08-13 13:36:19 +0000
@@ -25,7 +25,7 @@
_description = 'Create Tasks from Product Backlogs'
_columns = {
'user_id': fields.many2one('res.users', 'Assign To')
- }
+ }
def do_create(self, cr, uid, ids, context=None):
mod_obj = self.pool.get('ir.model.data')
=== modified file 'project_scrum/wizard/project_scrum_backlog_merger.py'
--- project_scrum/wizard/project_scrum_backlog_merger.py 2010-07-15 05:47:56 +0000
+++ project_scrum/wizard/project_scrum_backlog_merger.py 2010-08-13 13:36:19 +0000
@@ -26,7 +26,7 @@
_description = 'Merge Product Backlogs'
_columns = {
'project_id': fields.many2one('project.project', 'Project', help="Select project for the new product backlog"),
- }
+ }
def check_backlogs(self, cr, uid, ids, context=None):
backlog_obj = self.pool.get('project.scrum.product.backlog')
@@ -54,7 +54,7 @@
'views': [(resource_id,'form')],
'type': 'ir.actions.act_window',
'target': 'new',
- }
+ }
return self.do_merge(cr, uid, ids, context=context)
def do_merge(self, cr, uid, ids, context=None):
=== modified file 'project_scrum/wizard/project_scrum_backlog_sprint.py'
--- project_scrum/wizard/project_scrum_backlog_sprint.py 2010-07-15 05:47:56 +0000
+++ project_scrum/wizard/project_scrum_backlog_sprint.py 2010-08-13 13:36:19 +0000
@@ -28,11 +28,11 @@
'sprint_id': fields.many2one('project.scrum.sprint', 'Sprint Name', required=True),
'state_open': fields.boolean('Set Open', help="Change the state of product backlogs to open if its in draft state"),
'convert_to_task': fields.boolean('Convert To Task', help="Create Task for Product Backlog")
- }
+ }
_defaults = {
'state_open': True,
'convert_to_task': True,
- }
+ }
def assign_sprint(self, cr, uid, ids, context=None):
backlog_obj = self.pool.get('project.scrum.product.backlog')
=== modified file 'project_timesheet/__openerp__.py'
--- project_timesheet/__openerp__.py 2010-07-28 11:43:44 +0000
+++ project_timesheet/__openerp__.py 2010-08-13 13:36:19 +0000
@@ -35,8 +35,8 @@
'update_xml': ["process/project_timesheet_process.xml", "report/task_report_view.xml"],
'demo_xml': [],
'test': [
- 'test/worktask_entry_to_timesheetline_entry.yml',
- ],
+ 'test/worktask_entry_to_timesheetline_entry.yml',
+ ],
'installable': True,
'active': False,
'certificate': '0075123647453',
=== modified file 'project_timesheet/process/project_timesheet_process.xml'
--- project_timesheet/process/project_timesheet_process.xml 2010-07-02 14:15:50 +0000
+++ project_timesheet/process/project_timesheet_process.xml 2010-08-13 13:36:19 +0000
@@ -7,7 +7,6 @@
-->
<record id="process_node_timesheettask0" model="process.node">
- <!-- <field name="menu_id" ref="hr_timesheet.menu_act_hr_timesheet_line_evry1_all_form"/>-->
<field name="model_id" ref="hr_timesheet.model_hr_analytic_timesheet"/>
<field eval=""""state"""" name="kind"/>
<field eval=""""Timesheet task"""" name="name"/>
=== modified file 'project_timesheet/report/task_report.py'
--- project_timesheet/report/task_report.py 2010-08-10 10:32:59 +0000
+++ project_timesheet/report/task_report.py 2010-08-13 13:36:19 +0000
@@ -23,68 +23,6 @@
from osv import fields,osv
import tools
-#class task_report(osv.osv):
-# _name = "task.report"
-# _description = "Project task report"
-# _auto = False
-# _columns = {
-# 'name': fields.char('Task',size=64,required=False, readonly=True),
-# 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
-# ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
-# 'user_id':fields.many2one('res.users', 'User', readonly=True),
-# 'task_nbr': fields.float('Task Number', readonly=True),
-# 'task_hrs': fields.float('Task Hours', readonly=True),
-# 'task_progress': fields.float('Task Progress', readonly=True),
-# 'company_id' : fields.many2one('res.company', 'Company'),
-# 'task_state': fields.selection([('draft', 'Draft'),('open', 'Open'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done'),('no','No Task')], 'Status', readonly=True),
-# 'project_id':fields.many2one('project.project', 'Project'),
-# 'year': fields.char('Year',size=64,required=False, readonly=True),
-# 'date_start': fields.datetime('Starting Date',readonly=True),
-# 'date_end': fields.datetime('Ending Date',readonly=True),
-# 'date_deadline': fields.date('Deadline',readonly=True),
-# 'type': fields.many2one('project.task.type', 'Stage'),
-# 'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Importance'),
-# 'assign_to': fields.many2one('res.users', 'Assigned to', readonly=True),
-# 'remaining_hrs': fields.float('Remaining Hours', readonly=True),
-# }
-#
-# def init(self, cr):
-# tools.sql.drop_view_if_exists(cr, 'task_report')
-# cr.execute('''
-# create or replace view task_report as (
-# select
-# min(t.id) as id,
-# to_char(t.create_date, 'YYYY') as year,
-# to_char(t.create_date,'MM') as month,
-# u.id as user_id,
-# u.company_id as company_id,
-# t.name as name,
-# t.project_id as project_id,
-# to_char(t.date_start,'YYYY/mm/dd') as date_start,
-# to_char(t.date_end,'YYYY/mm/dd') as date_end,
-# to_char(t.date_deadline,'YYYY/mm/dd') as date_deadline,
-# t.type as type,
-# t.priority as priority,
-# t.user_id as assign_to,
-# t.remaining_hours as remaining_hrs,
-# count(t.*) as task_nbr,
-# sum(t.planned_hours) as task_hrs,
-# sum(t.planned_hours * (100 - t.progress) / 100) as task_progress,
-# case when t.state is null then 'no' else t.state end as task_state
-# from
-# res_users u
-# left join
-# project_task t on (u.id = t.user_id)
-# where
-# u.active
-# group by
-# to_char(t.create_date, 'YYYY'),to_char(t.create_date,'MM'),u.id, u.company_id, t.state
-# ,t.name,t.project_id,t.type,t.priority,
-# t.user_id,t.remaining_hours,to_char(t.date_start,'YYYY/mm/dd'),to_char(t.date_end,'YYYY/mm/dd'),to_char(t.date_deadline,'YYYY/mm/dd')
-# )
-# ''')
-#task_report()
-
class report_timesheet_task_user(osv.osv):
_name = "report.timesheet.task.user"
_auto = False
@@ -125,8 +63,7 @@
'user_id': fields.many2one('res.users', 'User',readonly=True),
'timesheet_hrs': fields.function(get_hrs_timesheet, method=True, string="Timesheet Hours"),
'task_hrs': fields.function(_get_task_hours, method=True, string="Task Hours"),
-
- }
+ }
def init(self, cr):
cr.execute(""" create or replace view report_timesheet_task_user as (
=== modified file 'project_timesheet/report/task_report_view.xml'
--- project_timesheet/report/task_report_view.xml 2010-07-02 14:15:50 +0000
+++ project_timesheet/report/task_report_view.xml 2010-08-13 13:36:19 +0000
@@ -7,122 +7,6 @@
parent="hr.menu_hr_root"
sequence="40" />
- <!-- Tasks by projects and users
-
- <record id="view_task_project_form" model="ir.ui.view">
- <field name="name">task.report.form</field>
- <field name="model">task.report</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Tasks by User">
- <field name="user_id" select="1"/>
- <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
- <field name="task_nbr" select="2"/>
- <field name="task_hrs" select="2"/>
- <field name="task_progress" select="2"/>
- <field name="task_state" select="1"/>
- </form>
- </field>
- </record>
-
- <record id="view_task_project_graph" model="ir.ui.view">
- <field name="name">task.report.graph</field>
- <field name="model">task.report</field>
- <field name="type">graph</field>
- <field name="arch" type="xml">
- <graph string="Tasks by User" type="bar">
- <field name="user_id"/>
- <field name="task_progress" operator="+"/>
- </graph>
- </field>
- </record>
-
- <record id="view_task_project_tree" model="ir.ui.view">
- <field name="name">task.report.tree</field>
- <field name="model">task.report</field>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <tree string="Tasks by User">
- <field name="date_start" select="1" invisible="1"/>
- <field name="name" select="1"/>
- <field name="project_id" select="1"/>
- <field name="assign_to" select="1"/>
- <field name="type" select="1" invisible="1"/>
- <field name="priority" select="1" invisible="1"/>
- <field name="date_end" select="1" invisible="1"/>
- <field name="month" select="1" invisible="1"/>
- <field name="year" select="1" invisible="1"/>
- <field name="user_id" invisible="1"/>
- <field name="remaining_hrs"/>
- <field name="date_deadline" invisible="1"/>
- <field name="company_id" groups="base.group_multi_company"/>
- <field name="task_nbr"/>
- <field name="task_hrs"/>
- <field name="task_progress"/>
- <field name="task_state"/>
- </tree>
- </field>
- </record>
-
- <record id="view_report_task_search" model="ir.ui.view">
- <field name="name">task.report.search</field>
- <field name="model">task.report</field>
- <field name="type">search</field>
- <field name="arch" type="xml">
- <search string="Tasks by User">
- <group col="10" colspan="4">
- <filter icon="terp-project" string="This Year" domain="[('year','=',time.strftime('%%Y'))]" help="Tasks performed in this year"/>
- <filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Tasks performed in this month"/>
- <separator orientation="vertical"/>
- <field name="project_id" select="1"/>
- <field name="user_id" select="1" widget="selection"/>
- <newline/>
- <group expand="1" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
- <filter icon="terp-project"
- string="Very urgent"
- domain="[('priority','=','0')]"/>
- <filter icon="terp-project"
- string="Urgent"
- domain="[('priority','=','1')]"/>
- <filter icon="terp-project"
- string="Medium"
- domain="[('priority','=','2')]"/>
- <filter icon="terp-project"
- string="Low"
- domain="[('priority','=','3')]"/>
- <filter icon="terp-project"
- string="Very Low"
- domain="[('priority','=','4')]"/>
- </group>
- <newline/>
- <group expand="1" string="Group By..." colspan="10" col="11" groups="base.group_extended">
- <filter string="User" icon="terp-project" context="{'group_by':'user_id'}" />
- <filter string="Project" icon="terp-project" context="{'group_by':'project_id'}" />
- <filter string="Company" icon="terp-project" context="{'group_by':'company_id'}" />
- <separator orientation="vertical"/>
- <filter string="State" icon="terp-project" context="{'group_by':'task_state'}"/>
- <filter string="Stage" icon="terp-project" context="{'group_by':'type'}"/>
- <separator orientation="vertical"/>
- <filter string="Month" icon="terp-project" context="{'group_by':'month'}"/>
- <filter string="Year" icon="terp-project" context="{'group_by':'year'}"/>
- </group>
- </group>
- </search>
- </field>
- </record>
-
- <record id="action_project_task" model="ir.actions.act_window">
- <field name="name">Tasks</field>
- <field name="res_model">task.report</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,graph</field>
- <field name="domain">[]</field>
- <field name="context">{"search_default_user_id":uid}</field>
- <field name="search_view_id" ref="view_report_task_search"/>
- </record>
- <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
- <menuitem action="action_project_task" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
--->
<!-- Report for Users' Timesheet and Task Hours per Month -->
<record id="view_report_timesheet_task_user_tree" model="ir.ui.view">
@@ -169,7 +53,7 @@
<field name="context">{"search_default_user_id":uid}</field>
<field name="search_view_id" ref="view_report_timesheet_task_user_search"/>
</record>
- <menuitem id="menu_timesheet_task_user" parent="hr.menu_hr_reporting"
+ <menuitem id="menu_timesheet_task_user" parent="hr.menu_hr_reporting"
action="action_report_timesheet_task_user" sequence="4"/>
</data>
=== modified file 'purchase/process/purchase_process.xml'
--- purchase/process/purchase_process.xml 2010-06-29 12:09:26 +0000
+++ purchase/process/purchase_process.xml 2010-08-13 13:36:19 +0000
@@ -17,7 +17,6 @@
-->
<record id="process_node_packinginvoice0" model="process.node">
-<!-- <field name="menu_id" ref="stock.menu_action_picking_tree"/>-->
<field name="model_id" ref="stock.model_stock_picking"/>
<field eval=""""state"""" name="kind"/>
<field eval=""""Outgoing Products"""" name="name"/>
@@ -119,7 +118,6 @@
</record>
<record id="process_node_productrecept0" model="process.node">
-<!-- <field name="menu_id" ref="stock.menu_action_picking_tree"/>-->
<field name="model_id" ref="stock.model_stock_picking"/>
<field eval=""""subflow"""" name="kind"/>
<field eval=""""Incoming Products"""" name="name"/>
=== modified file 'purchase/purchase.py'
--- purchase/purchase.py 2010-08-05 06:48:18 +0000
+++ purchase/purchase.py 2010-08-13 13:36:19 +0000
@@ -53,7 +53,7 @@
'amount_untaxed': 0.0,
'amount_tax': 0.0,
'amount_total': 0.0,
- }
+ }
val = val1 = 0.0
cur = order.pricelist_id.currency_id
for line in order.order_line:
@@ -294,14 +294,14 @@
if manager and not (manager.id in managers):
managers.append(manager.id)
for manager_id in managers:
- request.create(cr, uid,
- {'name' : "Purchase amount over the limit",
+ request.create(cr, uid,{
+ 'name' : "Purchase amount over the limit",
'act_from' : uid,
'act_to' : manager_id,
'body': 'Somebody has just confirmed a purchase with an amount over the defined limit',
'ref_partner_id': po.partner_id.id,
'ref_doc1': 'purchase.order,%d' % (po.id,),
- })
+ })
def inv_line_create(self, cr, uid, a, ol):
return (0, False, {
'name': ol.name,
@@ -521,18 +521,18 @@
order_infos = new_order[0]
if not order_infos:
order_infos.update({
- 'origin': porder.origin,
- 'date_order': time.strftime('%Y-%m-%d'),
- 'partner_id': porder.partner_id.id,
- 'partner_address_id': porder.partner_address_id.id,
- 'dest_address_id': porder.dest_address_id.id,
- 'warehouse_id': porder.warehouse_id.id,
- 'location_id': porder.location_id.id,
- 'pricelist_id': porder.pricelist_id.id,
- 'state': 'draft',
- 'order_line': {},
- 'notes': '%s' % (porder.notes or '',),
- 'fiscal_position': porder.fiscal_position and porder.fiscal_position.id or False,
+ 'origin': porder.origin,
+ 'date_order': time.strftime('%Y-%m-%d'),
+ 'partner_id': porder.partner_id.id,
+ 'partner_address_id': porder.partner_address_id.id,
+ 'dest_address_id': porder.dest_address_id.id,
+ 'warehouse_id': porder.warehouse_id.id,
+ 'location_id': porder.location_id.id,
+ 'pricelist_id': porder.pricelist_id.id,
+ 'state': 'draft',
+ 'order_line': {},
+ 'notes': '%s' % (porder.notes or '',),
+ 'fiscal_position': porder.fiscal_position and porder.fiscal_position.id or False,
})
else:
if porder.notes:
=== modified file 'purchase/purchase_unit_test.xml'
--- purchase/purchase_unit_test.xml 2010-06-05 22:45:14 +0000
+++ purchase/purchase_unit_test.xml 2010-08-13 13:36:19 +0000
@@ -51,10 +51,6 @@
</assert>
<assert model="purchase.order" id="test_purchase_1" string="Test purchase's invoice has the same amount and is currently a draft">
- <!--
- <test expr="invoice_id.amount_untaxed == amount_untaxed" />
- <test expr="invoice_id.amount_total == amount_total" />
- -->
<test expr="invoice_id.state">draft</test>
</assert>
=== modified file 'purchase/wizard/purchase_installer.py'
--- purchase/wizard/purchase_installer.py 2010-07-13 13:43:16 +0000
+++ purchase/wizard/purchase_installer.py 2010-08-13 13:36:19 +0000
@@ -27,7 +27,7 @@
_columns = {
'purchase_requisition':fields.boolean('Purchase Requisition',help="Manages your Purchase Requisition and allow you to easily keep track and manage all your purchase orders."),
'purchase_analytic_plans': fields.boolean('Purchase Analytic Plans',help="Manages analytic distribution and purchase orders.")
- }
+ }
purchase_installer()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'purchase/wizard/purchase_line_invoice.py'
--- purchase/wizard/purchase_line_invoice.py 2010-04-13 10:28:22 +0000
+++ purchase/wizard/purchase_line_invoice.py 2010-08-13 13:36:19 +0000
@@ -49,7 +49,7 @@
property_obj=self.pool.get('ir.property')
account_fiscal_obj=self.pool.get('account.fiscal.position')
invoice_line_obj=self.pool.get('account.invoice.line')
-
+
def make_invoice(order, lines):
a = order.partner_id.property_account_payable.id
if order.partner_id and order.partner_id.property_payment_term.id:
@@ -73,7 +73,7 @@
}
inv_id = invoice_obj.create(cr, uid, inv)
return inv_id
-
+
for line in purchase_line_obj.browse(cr,uid,record_ids):
if (not line.invoiced) and (line.state not in ('draft','cancel')):
if not line.order_id.id in invoices:
@@ -108,25 +108,25 @@
cr.execute('insert into purchase_order_line_invoice_rel (order_line_id,invoice_id) values (%s,%s)', (line.id, inv_id))
purchase_line_obj.write(cr, uid, [line.id], {'invoiced': True})
invoices[line.order_id.id].append((line,inv_id))
-
+
res = []
for result in invoices.values():
order = result[0][0].order_id
il = map(lambda x: x[1], result)
res.append(make_invoice(order, il))
-
+
return {
- 'domain': "[('id','in', ["+','.join(map(str,res))+"])]",
- 'name': _('Supplier Invoices'),
- 'view_type': 'form',
- 'view_mode': 'tree,form',
- 'res_model': 'account.invoice',
- 'view_id': False,
- 'context': "{'type':'in_invoice'}",
- 'type': 'ir.actions.act_window'
- }
+ 'domain': "[('id','in', ["+','.join(map(str,res))+"])]",
+ 'name': _('Supplier Invoices'),
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'res_model': 'account.invoice',
+ 'view_id': False,
+ 'context': "{'type':'in_invoice'}",
+ 'type': 'ir.actions.act_window'
+ }
purchase_line_invoice()
-
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'purchase/wizard/purchase_order_group.py'
--- purchase/wizard/purchase_order_group.py 2010-06-30 10:31:08 +0000
+++ purchase/wizard/purchase_order_group.py 2010-08-13 13:36:19 +0000
@@ -50,14 +50,14 @@
allorders = order_obj.do_merge(cr, uid, context.get('active_ids',[]), context)
return {
- 'domain': "[('id','in', [" + ','.join(map(str, allorders)) + "])]",
- 'name': 'Purchase Orders',
- 'view_type': 'form',
- 'view_mode': 'tree,form',
- 'res_model': 'purchase.order',
- 'view_id': False,
- 'type': 'ir.actions.act_window',
- 'search_view_id': id['res_id']
+ 'domain': "[('id','in', [" + ','.join(map(str, allorders)) + "])]",
+ 'name': 'Purchase Orders',
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'res_model': 'purchase.order',
+ 'view_id': False,
+ 'type': 'ir.actions.act_window',
+ 'search_view_id': id['res_id']
}
purchase_order_group()
=== modified file 'purchase_requisition/__openerp__.py'
--- purchase_requisition/__openerp__.py 2010-08-05 11:23:26 +0000
+++ purchase_requisition/__openerp__.py 2010-08-13 13:36:19 +0000
@@ -33,11 +33,10 @@
"demo_xml" : [],
"update_xml" : ["wizard/purchase_requisition_partner_view.xml",
"purchase_requisition_view.xml",
- "security/ir.model.access.csv","purchase_requisition_sequence.xml"],
+ "security/ir.model.access.csv","purchase_requisition_sequence.xml"
+ ],
"active": False,
- "test":[
-# 'test/purchase_requisition.yml','test/purchase_requisition_exclusive.yml'
- ],
+ "test":[],
"installable": True
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'purchase_requisition/purchase_requisition.py'
--- purchase_requisition/purchase_requisition.py 2010-08-05 11:23:26 +0000
+++ purchase_requisition/purchase_requisition.py 2010-08-13 13:36:19 +0000
@@ -117,7 +117,7 @@
_defaults = {
'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.requisition.line', context=c),
- }
+ }
purchase_requisition_line()
class purchase_order(osv.osv):
@@ -179,7 +179,7 @@
})],
'purchase_ids': [(6,0,[po_id])]
})
- self.write(cr,uid,proc_id,{'requisition_id':requisition_id})
+ self.write(cr,uid,proc_id,{'requisition_id':requisition_id})
return res
procurement_order()
=== modified file 'purchase_requisition/wizard/purchase_requisition_partner.py'
--- purchase_requisition/wizard/purchase_requisition_partner.py 2010-08-05 11:23:26 +0000
+++ purchase_requisition/wizard/purchase_requisition_partner.py 2010-08-13 13:36:19 +0000
@@ -31,7 +31,7 @@
_columns = {
'partner_id': fields.many2one('res.partner', 'Partner', required=True,domain=[('supplier', '=', True)]),
'partner_address_id':fields.many2one('res.partner.address', 'Address', required=True),
- }
+ }
def view_init(self, cr, uid, fields_list, context=None):
res = super(purchase_requisition_partner, self).view_init(cr, uid, fields_list, context=context)
@@ -102,7 +102,7 @@
'price_unit': price,
'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
'notes': product.description_purchase,
- }
+ }
taxes_ids = line.product_id.product_tmpl_id.supplier_taxes_id
taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids)
purchase_order_line.update({
@@ -118,7 +118,7 @@
'company_id': tender.company_id.id,
'fiscal_position': partner.property_account_position and partner.property_account_position.id or False,
'requisition_id':tender.id,
- })
+ })
order_ids=[]
for order_line in list_line:
order_line.update({
=== modified file 'report_designer/installer.py'
--- report_designer/installer.py 2010-07-13 13:43:16 +0000
+++ report_designer/installer.py 2010-08-13 13:36:19 +0000
@@ -37,6 +37,6 @@
"After installation you will get Cube Browser and Cube Desinger in Reporting Menu. "
"Cube Browser is used to generate the reports with table view (mdx view) of mdx query "
"and Cube designer is used to make cubes in BI."),
- }
+ }
report_designer_installer()
=== modified file 'resource/__openerp__.py'
--- resource/__openerp__.py 2010-07-28 11:43:44 +0000
+++ resource/__openerp__.py 2010-08-13 13:36:19 +0000
@@ -39,7 +39,6 @@
'depends': ['base', 'process'],
'init_xml': [],
'update_xml': [
- #'security/resource_security.xml',
'security/ir.model.access.csv',
'resource_view.xml',
],
=== modified file 'resource/resource_view.xml'
--- resource/resource_view.xml 2010-07-23 14:05:55 +0000
+++ resource/resource_view.xml 2010-08-13 13:36:19 +0000
@@ -41,7 +41,7 @@
<newline/>
<group expand="0" string="Group By..." colspan="4" col="20">
<filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager'}"/>
- </group>
+ </group>
</search>
</field>
</record>
@@ -78,7 +78,6 @@
<field name="name" select="1"/>
<field name="manager" select="1"/>
<field name="company_id" select="1" groups="base.group_multi_company"/>
- <!-- <field colspan="4" name="week_id" nolabel="1" widget="one2many_list"/>-->
</form>
</field>
</record>
=== modified file 'sale/__openerp__.py'
--- sale/__openerp__.py 2010-08-12 10:48:36 +0000
+++ sale/__openerp__.py 2010-08-13 13:36:19 +0000
@@ -18,8 +18,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
-
-
{
'name': 'Sales Management',
'version': '1.0',
@@ -66,7 +64,6 @@
'sale_report.xml',
'stock_view.xml',
'board_sale_view.xml',
-# 'process/sale_process.xml',
],
'demo_xml': ['sale_demo.xml','board_sale_demo.xml'],
'test': [
=== modified file 'sale/board_sale_demo.xml'
--- sale/board_sale_demo.xml 2010-06-25 12:20:26 +0000
+++ sale/board_sale_demo.xml 2010-08-13 13:36:19 +0000
@@ -2,16 +2,5 @@
<openerp>
<data noupdate="1">
- <!--
- Administrator shortcut
- Demo user startup menu
- -->
- <!-- <record id="sc_sale_dash" model="ir.ui.view_sc">
- <field name="name">Sales dashboard</field>
- <field name="user_id" ref="base.user_root"/>
- <field name="resource">ir.ui.menu</field>
- <field name="sequence">1</field>
- <field name="res_id" ref="menu_board_sales_manager"/>
- </record> -->
</data>
</openerp>
=== modified file 'sale/board_sale_view.xml'
--- sale/board_sale_view.xml 2010-07-26 05:56:23 +0000
+++ sale/board_sale_view.xml 2010-08-13 13:36:19 +0000
@@ -5,23 +5,6 @@
<field name="name">Sales</field>
</record>
- <!-- <record model="ir.actions.act_window" id="board_crm_case_categ_phone_incoming0">
- <field name="res_model">crm.phonecall</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,calendar</field>
- <field name="view_id" ref="crm.crm_case_phone_tree_view"/>
- <field name="domain">[('user_id','=',uid)]</field>
- <field name="context" eval="{'default_state':'open'}"/>
- <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
- </record>
- <record model="ir.actions.act_window" id="board_crm_case_categ_meet">
- <field name="res_model">crm.meeting</field>
- <field name="view_mode">tree,form,gantt</field>
- <field name="view_id" ref="crm.crm_case_tree_view_meet"/>
- <field name="domain">[('user_id','=',uid)]</field>
- <field name="domain">[('date','>=',time.strftime('%Y-%m-%d')),('date','<=',(datetime.datetime.today() + datetime.timedelta(days=2)).strftime('%Y-%m-%d'))]</field>
- <field name="context" eval="{'default_state':'open'}"/>
- </record>-->
<record id="board_sales_manager_form" model="ir.ui.view">
<field name="name">board.sales.manager.form</field>
<field name="model">board.board</field>
=== modified file 'sale/process/sale_process.xml'
--- sale/process/sale_process.xml 2010-05-27 12:47:06 +0000
+++ sale/process/sale_process.xml 2010-08-13 13:36:19 +0000
@@ -75,7 +75,6 @@
</record>
<record id="process_node_packinglist0" model="process.node">
-<!-- <field name="menu_id" ref="stock.menu_action_picking_tree"/>-->
<field name="model_id" ref="stock.model_stock_picking"/>
<field eval=""""state"""" name="kind"/>
<field eval=""""Pick List"""" name="name"/>
=== modified file 'sale/report/sale_report.py'
--- sale/report/sale_report.py 2010-07-09 10:05:41 +0000
+++ sale/report/sale_report.py 2010-08-13 13:36:19 +0000
@@ -22,7 +22,6 @@
import tools
from osv import fields,osv
-
class sale_report(osv.osv):
_name = "sale.report"
_description = "Sales Orders Statistics"
=== modified file 'sale/sale.py'
--- sale/sale.py 2010-08-13 06:10:54 +0000
+++ sale/sale.py 2010-08-13 13:36:19 +0000
@@ -290,7 +290,6 @@
'partner_invoice_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['invoice'])['invoice'],
'partner_order_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['contact'])['contact'],
'partner_shipping_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['delivery'])['delivery'],
-# 'pricelist_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').browse(cr, uid, context['partner_id']).property_product_pricelist.id,
}
_order = 'name desc'
@@ -315,7 +314,6 @@
# Que faire si le client a une pricelist a lui ?
if shop.pricelist_id.id:
v['pricelist_id'] = shop.pricelist_id.id
- #v['payment_default_id']=shop.payment_default_id.id
return {'value': v}
def action_cancel_draft(self, cr, uid, ids, *args):
=== modified file 'sale/sale_demo.xml'
--- sale/sale_demo.xml 2010-05-27 12:47:06 +0000
+++ sale/sale_demo.xml 2010-08-13 13:36:19 +0000
@@ -70,9 +70,6 @@
<field name="type">make_to_stock</field>
</record>
-
-
-
<!--
Resource: sale.order
-->
@@ -110,9 +107,6 @@
<field name="type">make_to_order</field>
</record>
-
-
-
<!--
Resource: sale.order
-->
=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml 2010-08-13 06:06:34 +0000
+++ sale/sale_view.xml 2010-08-13 13:36:19 +0000
@@ -169,8 +169,6 @@
<page groups="base.group_extended" string="Extra Info">
<field name="th_weight"/>
<field name="address_allotment_id"/>
-<!-- <separator colspan="4" string="Properties"/>-->
-<!-- <field colspan="4" name="property_ids" nolabel="1"/>-->
</page>
<page string="Notes">
<field colspan="4" name="notes" nolabel="1"/>
@@ -411,9 +409,6 @@
attrs="{'invisible': ['|',('state', 'not in', ('confirmed','exception')),('invoiced', '=', 0)]}"/>
</group>
</page>
-<!-- <page string="Properties" groups="base.group_extended">-->
-<!-- <field name="property_ids" nolabel="1"/>-->
-<!-- </page>-->
<page string="Invoice Lines" groups="base.group_extended">
<field colspan="4" name="invoice_lines" nolabel="1"/>
</page>
=== modified file 'sale/sale_workflow.xml'
--- sale/sale_workflow.xml 2010-05-27 12:47:06 +0000
+++ sale/sale_workflow.xml 2010-08-13 13:36:19 +0000
@@ -6,7 +6,7 @@
<field name="osv">sale.order</field>
<field name="on_create">True</field>
</record>
-
+
<!-- Activity -->
<record id="act_draft" model="workflow.activity">
<field name="wkf_id" ref="wkf_sale"/>
@@ -28,7 +28,7 @@
<field name="wkf_id" ref="wkf_sale"/>
<field name="name">wait_ship</field>
</record>
-
+
<record id="act_done" model="workflow.activity">
<field name="wkf_id" ref="wkf_sale"/>
<field name="name">done</field>
@@ -88,10 +88,6 @@
<field name="wkf_id" ref="wkf_sale"/>
<field name="name">ship</field>
<field name="kind">function</field>
- <!--
- <field name="kind">subflow</field>
- <field name="subflow_id" search="[('osv','=','stock.picking')]"/>
- -->
<field name="action">action_ship_create()</field>
</record>
<record id="act_ship_except" model="workflow.activity">
@@ -113,78 +109,78 @@
<field name="kind">stopall</field>
<field name="action">action_cancel()</field>
</record>
-
+
<!-- Transistion -->
-
+
<record id="trans_invoice_end_done" model="workflow.transition">
<field name="act_from" ref="act_invoice_end"/>
<field name="act_to" ref="act_done"/>
</record>
-
+
<record id="trans_draft_router" model="workflow.transition">
<field name="act_from" ref="act_draft"/>
<field name="act_to" ref="act_router"/>
<field name="signal">order_confirm</field>
</record>
-
+
<record id="trans_draft_cancel" model="workflow.transition">
<field name="act_from" ref="act_draft"/>
<field name="act_to" ref="act_cancel"/>
<field name="signal">cancel</field>
</record>
-
+
<record id="trans_wait_invoice_all_lines_invoiced" model="workflow.transition">
<field name="act_from" ref="act_wait_invoice"/>
<field name="act_to" ref="act_invoice_end"/>
<field name="signal">all_lines</field>
</record>
-
+
<record id="trans_router_wait_invoice_shipping" model="workflow.transition">
<field name="act_from" ref="act_wait_invoice"/>
<field name="act_to" ref="act_invoice_end"/>
<field name="condition">(order_policy=='picking')</field>
</record>
-
+
<record id="trans_router_wait_invoice" model="workflow.transition">
<field name="act_from" ref="act_router"/>
<field name="act_to" ref="act_wait_invoice"/>
</record>
-
+
<record id="trans_router_wait_ship" model="workflow.transition">
<field name="act_from" ref="act_router"/>
<field name="act_to" ref="act_wait_ship"/>
</record>
-
+
<record id="trans_wait_invoice_cancel2" model="workflow.transition">
<field name="act_from" ref="act_wait_invoice"/>
<field name="act_to" ref="act_cancel2"/>
<field name="signal">cancel</field>
</record>
-
+
<record id="trans_wait_ship_cancel3" model="workflow.transition">
<field name="act_from" ref="act_wait_ship"/>
<field name="act_to" ref="act_cancel3"/>
<field name="signal">cancel</field>
</record>
-
+
<record id="trans_wait_ship_ship" model="workflow.transition">
<field name="act_from" ref="act_wait_ship"/>
<field name="act_to" ref="act_ship"/>
<field name="condition">(order_policy!='prepaid') or invoiced</field>
</record>
-
+
<record id="trans_wait_invoice_invoice" model="workflow.transition">
<field name="act_from" ref="act_wait_invoice"/>
<field name="act_to" ref="act_invoice"/>
<field name="condition">(order_policy=='prepaid') or ((order_policy=='postpaid') and shipped)</field>
</record>
-
+
<record id="trans_wait_invoice_invoice_manual" model="workflow.transition">
<field name="act_from" ref="act_wait_invoice"/>
<field name="act_to" ref="act_invoice"/>
<field name="signal">manual_invoice</field>
</record>
-
+
<record id="trans_invoice_invoice_end" model="workflow.transition">
<field name="act_from" ref="act_invoice"/>
<field name="act_to" ref="act_invoice_end"/>
@@ -214,7 +210,7 @@
<field name="act_from" ref="act_ship_end"/>
<field name="act_to" ref="act_done"/>
</record>
-
+
<record id="trans_ship_ship_end" model="workflow.transition">
<field name="act_from" ref="act_ship"/>
<field name="act_to" ref="act_ship_end"/>
@@ -225,10 +221,6 @@
<record id="trans_ship_ship_except" model="workflow.transition">
<field name="act_from" ref="act_ship"/>
<field name="act_to" ref="act_ship_except"/>
- <!--
- <field name="trigger_model">procurement.order</field>
- <field name="trigger_expr_id">procurement_lines_get()</field>
- -->
<field name="condition">test_state('canceled')</field>
</record>
<record id="trans_ship_except_ship" model="workflow.transition">
@@ -246,6 +238,6 @@
<field name="act_to" ref="act_ship_cancel"/>
<field name="signal">ship_cancel</field>
</record>
-
+
</data>
</openerp>
=== modified file 'sale/stock.py'
--- sale/stock.py 2010-08-04 18:59:19 +0000
+++ sale/stock.py 2010-08-13 13:36:19 +0000
@@ -183,10 +183,10 @@
'quantity': sale_line.product_uos_qty,
'invoice_line_tax_id': [(6, 0, tax_ids)],
'account_analytic_id': account_analytic_id,
- }, context=context)
+ }, context=context)
self.pool.get('sale.order.line').write(cursor, user, [sale_line.id], {'invoiced':True,
'invoice_lines': [(6, 0, [invoice_line_id])],
- })
+ })
return result
=== modified file 'sale/wizard/sale_make_invoice.xml'
--- sale/wizard/sale_make_invoice.xml 2010-07-29 10:32:53 +0000
+++ sale/wizard/sale_make_invoice.xml 2010-08-13 13:36:19 +0000
@@ -27,13 +27,5 @@
<field name="target">new</field>
</record>
-<!-- <act_window name="Make Invoices"-->
-<!-- res_model="sale.make.invoice"-->
-<!-- src_model="sale.order"-->
-<!-- view_mode="form"-->
-<!-- target="new"-->
-<!-- key2="client_action_multi"-->
-<!-- id="action_view_sale_order_make_invoice"/>-->
-
</data>
</openerp>
=== modified file 'sale/wizard/sale_make_invoice_advance.py'
--- sale/wizard/sale_make_invoice_advance.py 2010-07-21 06:44:41 +0000
+++ sale/wizard/sale_make_invoice_advance.py 2010-08-13 13:36:19 +0000
@@ -33,7 +33,7 @@
}
_default = {
'qtty' : lambda *a: 1
- }
+ }
def create_invoices(self, cr, uid, ids, context={}):
"""
To create invoices.
@@ -92,7 +92,7 @@
'comment': '',
'payment_term':sale.payment_term.id,
'fiscal_position': sale.fiscal_position.id or sale.partner_id.property_account_position.id
- }
+ }
inv_id = inv_obj.create(cr, uid, inv)
@@ -121,15 +121,15 @@
context.update({'invoice_id':list_inv})
- return {#'invoice_ids':list_inv,
- 'name': 'Open Invoice',
- 'view_type': 'form',
- 'view_mode': 'form',
- 'res_model': 'sale.open.invoice',
- 'type': 'ir.actions.act_window',
- 'target': 'new',
- 'context':context
- }
+ return {
+ 'name': 'Open Invoice',
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'sale.open.invoice',
+ 'type': 'ir.actions.act_window',
+ 'target': 'new',
+ 'context':context
+ }
sale_advance_payment_inv()
@@ -168,7 +168,6 @@
tree_id = mod_obj._get_id(cr, uid, 'account', 'invoice_tree')
tree_res = mod_obj.browse(cr, uid, tree_id, context=context).res_id
return {
-# 'domain': "[('id','in', ["+','.join(map(str, invoices))+"])]", # TODO
'name': 'Invoices',
'view_type': 'form',
'view_mode': 'form,tree',
@@ -180,9 +179,6 @@
'type': 'ir.actions.act_window',
}
-
-
-
sale_open_invoice()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'sale_crm/wizard/crm_make_sale.py'
--- sale_crm/wizard/crm_make_sale.py 2010-08-11 12:05:54 +0000
+++ sale_crm/wizard/crm_make_sale.py 2010-08-13 13:36:19 +0000
@@ -48,7 +48,7 @@
return False
lead = lead_obj.read(cr, uid, active_id, ['partner_id'])
return lead['partner_id']
-
+
def view_init(self, cr, uid, fields_list, context=None):
if context is None:
context = {}
@@ -58,8 +58,8 @@
if not line.section_id:
raise osv.except_osv(_('Warning !'), _(' Sales Team is not specified.'))
return super(crm_make_sale, self).view_init(cr, uid, fields_list, context=context)
-
-
+
+
def makeOrder(self, cr, uid, ids, context=None):
"""
@@ -176,9 +176,9 @@
'view_id': False,
'type': 'ir.actions.act_window',
'res_id': new_ids
- }
+ }
return value
-
+
def _get_shop_id(self, cr, uid, ids, context=None):
if context is None:
context = {}
@@ -198,7 +198,7 @@
'partner_id': _selectPartner,
'close': 1
}
-
+
crm_make_sale()
class sale_order_make_line(osv.osv_memory):
=== modified file 'sale_journal/sale_journal_view.xml'
--- sale_journal/sale_journal_view.xml 2010-08-09 12:32:34 +0000
+++ sale_journal/sale_journal_view.xml 2010-08-13 13:36:19 +0000
@@ -43,7 +43,7 @@
<field name="view_mode">tree,form</field>
</record>
- <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="menu_sale_journal_config" action="action_definition_journal_invoice_type"/>
+ <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="menu_sale_journal_config" action="action_definition_journal_invoice_type"/>
<!-- sale journal Form view -->
@@ -479,21 +479,6 @@
<field name="object" eval="True"/>
</record>
-
- <!--record id="view_sale_journal_search_form" model="ir.ui.view">
- <field name="name">sale.order.journal.search</field>
- <field name="model">sale.order</field>
- <field name="type">search</field>
- <field name="inherit_id" ref="sale.view_sales_order_filter"/>
- <field name="arch" type="xml">
- <xpath expr="/search/group[@string='Group By...']/filter[@string='Salesman']" position="after">
- <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
- <separator orientation="vertical"/>
- </xpath>
- </field>
- </record-->
-
-
<record id="view_picking_delivery_jorunal_search_form" model="ir.ui.view">
<field name="name">stock.picking.journal.search</field>
<field name="model">stock.picking</field>
@@ -504,8 +489,8 @@
<filter string="Picking Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
</xpath>
</field>
- </record>
-
+ </record>
+
<record id="view_picking_out_jorunal_search_form" model="ir.ui.view">
<field name="name">stock.picking.journal.search</field>
<field name="model">stock.picking</field>
@@ -517,7 +502,7 @@
</xpath>
</field>
</record>
-
+
<record id="view_picking_in_jorunal_search_form" model="ir.ui.view">
<field name="name">stock.picking.journal.search</field>
<field name="model">stock.picking</field>
@@ -528,8 +513,8 @@
<filter string="Picking Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
</xpath>
</field>
- </record>
-
+ </record>
+
<record id="view_picking_internal_jorunal_search_form" model="ir.ui.view">
<field name="name">stock.picking.journal.search</field>
<field name="model">stock.picking</field>
@@ -540,8 +525,8 @@
<filter string="Picking Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
</xpath>
</field>
- </record>
-
-
+ </record>
+
+
</data>
</openerp>
=== modified file 'sale_layout/sale_layout.py'
--- sale_layout/sale_layout.py 2010-08-09 06:03:04 +0000
+++ sale_layout/sale_layout.py 2010-08-13 13:36:19 +0000
@@ -57,19 +57,20 @@
if (not type):
return {}
if type != 'article':
- temp = {'value': {
- 'product_id': False,
- 'uos_id': False,
- 'account_id': False,
- 'price_unit': 0.0,
- 'price_subtotal': 0.0,
- 'quantity': 0,
- 'discount': 0.0,
- 'invoice_line_tax_id': False,
- 'account_analytic_id': False,
- 'product_uom_qty':0.0,
- },
- }
+ temp = {
+ 'value': {
+ 'product_id': False,
+ 'uos_id': False,
+ 'account_id': False,
+ 'price_unit': 0.0,
+ 'price_subtotal': 0.0,
+ 'quantity': 0,
+ 'discount': 0.0,
+ 'invoice_line_tax_id': False,
+ 'account_analytic_id': False,
+ 'product_uom_qty':0.0,
+ },
+ }
if type == 'line':
temp['value']['name'] = ' '
if type == 'break':
=== modified file 'share/wizard/share_wizard.py'
--- share/wizard/share_wizard.py 2010-06-10 19:16:01 +0000
+++ share/wizard/share_wizard.py 2010-08-13 13:36:19 +0000
@@ -84,60 +84,60 @@
'user_type' : 'existing',
'domain': '[]',
'access_mode': 'readonly'
-
+
}
def default_get(self, cr, uid, fields, context=None):
- """
+ """
To get default values for the object.
- """
+ """
- res = super(share_create, self).default_get(cr, uid, fields, context=context)
+ res = super(share_create, self).default_get(cr, uid, fields, context=context)
if not context:
context={}
action_id = context.get('action_id', False)
- domain = context.get('domain', '[]')
-
-
+ domain = context.get('domain', '[]')
+
+
if 'action_id' in fields:
res['action_id'] = action_id
if 'domain' in fields:
- res['domain'] = domain
+ res['domain'] = domain
return res
def do_step_1(self, cr, uid, ids, context=None):
"""
This action to excute step 1
-
+
"""
if not context:
context = {}
- data_obj = self.pool.get('ir.model.data')
-
+ data_obj = self.pool.get('ir.model.data')
+
step1_form_view = data_obj._get_id(cr, uid, 'share', 'share_step1_form')
-
+
if step1_form_view:
- step1_form_view_id = data_obj.browse(cr, uid, step1_form_view, context=context).res_id
+ step1_form_view_id = data_obj.browse(cr, uid, step1_form_view, context=context).res_id
step1_id = False
for this in self.browse(cr, uid, ids, context=context):
vals ={
- 'domain': this.domain,
+ 'domain': this.domain,
'action_id': this.action_id and this.action_id.id or False,
- }
- step1_id = this.id
+ }
+ step1_id = this.id
context.update(vals)
value = {
- 'name': _('Step:2 Sharing Wizard'),
- 'view_type': 'form',
- 'view_mode': 'form',
- 'res_model': 'share.create',
+ 'name': _('Step:2 Sharing Wizard'),
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'share.create',
'view_id': False,
- 'res_id': step1_id,
- 'views': [(step1_form_view_id, 'form'), (False, 'tree'), (False, 'calendar'), (False, 'graph')],
- 'type': 'ir.actions.act_window',
+ 'res_id': step1_id,
+ 'views': [(step1_form_view_id, 'form'), (False, 'tree'), (False, 'calendar'), (False, 'graph')],
+ 'type': 'ir.actions.act_window',
'context': context,
'target': 'new'
}
@@ -147,35 +147,35 @@
def do_step_2(self, cr, uid, ids, context=None):
"""
This action to excute step 2
-
+
"""
if not context:
context = {}
- data_obj = self.pool.get('ir.model.data')
-
+ data_obj = self.pool.get('ir.model.data')
+
step2_form_view = data_obj._get_id(cr, uid, 'share', 'share_step2_form')
-
+
if step2_form_view:
- step2_form_view_id = data_obj.browse(cr, uid, step2_form_view, context=context).res_id
+ step2_form_view_id = data_obj.browse(cr, uid, step2_form_view, context=context).res_id
step1_id = False
for this in self.browse(cr, uid, ids, context=context):
- vals ={
- 'user_type': this.user_type,
+ vals = {
+ 'user_type': this.user_type,
'existing_user_ids': map(lambda x:x.id, this.user_ids),
'new_user': this.new_user,
- }
+ }
context.update(vals)
value = {
- 'name': _('Step:3 Sharing Wizard'),
- 'view_type': 'form',
- 'view_mode': 'form',
- 'res_model': 'share.create',
- 'view_id': False,
- 'views': [(step2_form_view_id, 'form'), (False, 'tree'), (False, 'calendar'), (False, 'graph')],
- 'type': 'ir.actions.act_window',
+ 'name': _('Step:3 Sharing Wizard'),
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'share.create',
+ 'view_id': False,
+ 'views': [(step2_form_view_id, 'form'), (False, 'tree'), (False, 'calendar'), (False, 'graph')],
+ 'type': 'ir.actions.act_window',
'context': context,
'target': 'new'
}
@@ -185,33 +185,33 @@
def do_step_3(self, cr, uid, ids, context=None):
"""
This action to excute step 3
-
+
"""
if not context:
context = {}
- for this in self.browse(cr, uid, ids, context=context):
- vals ={
+ for this in self.browse(cr, uid, ids, context=context):
+ vals = {
'access_mode': this.access_mode,
- }
+ }
context.update(vals)
-
+
group_obj = self.pool.get('res.groups')
user_obj = self.pool.get('res.users')
- fields_obj = self.pool.get('ir.model.fields')
- model_access_obj = self.pool.get('ir.model.access')
+ fields_obj = self.pool.get('ir.model.fields')
+ model_access_obj = self.pool.get('ir.model.access')
model_obj = self.pool.get('ir.model')
rule_obj = self.pool.get('ir.rule')
- action_obj = self.pool.get('ir.actions.act_window')
+ action_obj = self.pool.get('ir.actions.act_window')
new_users = context.get('new_user', False)
action_id = context.get('action_id', False)
user_type = context.get('user_type', False)
access_mode = context.get('access_mode', False)
action = action_obj.browse(cr, uid, action_id, context=context)
- active_model = action.res_model
-
+ active_model = action.res_model
+
active_id = False #TODO: Pass record id of res_model of action
existing_user_ids = context.get('existing_user_ids', False)
domain = eval(context.get('domain', '[]'))
@@ -225,10 +225,10 @@
else:
group = group_obj.browse(cr, uid, group_id, context=context)
if not group.share:
- raise osv.except_osv(_('Error'), _("Share Group is exits without sharing !"))
-
- # Create new user
-
+ raise osv.except_osv(_('Error'), _("Share Group is exits without sharing !"))
+
+ # Create new user
+
current_user = user_obj.browse(cr, uid, uid)
user_ids = []
if user_type == 'new' and new_users:
@@ -242,27 +242,28 @@
'groups_id': [(6,0,[group_id])],
'action_id': action_id,
'share': True,
- 'company_id': current_user.company_id and current_user.company_id.id})
+ 'company_id': current_user.company_id and current_user.company_id.id
+ })
user_ids.append(user_id)
context['new_user_ids'] = user_ids
# Modify existing user
- if user_type == 'existing':
+ if user_type == 'existing':
user_obj.write(cr, uid, existing_user_ids , {
'groups_id': [(4,group_id)],
'action_id': action_id
})
-
-
- #ACCESS RIGHTS / IR.RULES COMPUTATION
-
+
+
+ #ACCESS RIGHTS / IR.RULES COMPUTATION
+
active_model_ids = model_obj.search(cr, uid, [('model','=',active_model)])
active_model_id = active_model_ids and active_model_ids[0] or False
-
- def _get_relation(model_id, ttypes, new_obj=[]):
- obj = []
+
+ def _get_relation(model_id, ttypes, new_obj=[]):
+ obj = []
models = map(lambda x:x[1].model, new_obj)
- field_ids = fields_obj.search(cr, uid, [('model_id','=',model_id),('ttype','in', ttypes)])
+ field_ids = fields_obj.search(cr, uid, [('model_id','=',model_id),('ttype','in', ttypes)])
for field in fields_obj.browse(cr, uid, field_ids, context=context):
if field.relation not in models:
relation_model_ids = model_obj.search(cr, uid, [('model','=',field.relation)])
@@ -271,8 +272,8 @@
obj.append((field.relation_field, relation_model))
if relation_model_id != model_id and field.ttype in ['one2many', 'many2many']:
- obj += _get_relation(relation_model_id, [field.ttype], obj)
-
+ obj += _get_relation(relation_model_id, [field.ttype], obj)
+
return obj
active_model = model_obj.browse(cr, uid, active_model_id, context=context)
@@ -286,7 +287,7 @@
current_user = user_obj.browse(cr, uid, uid, context=context)
if access_mode == 'readonly':
res = []
- # intersect with read access rights of user running the
+ # intersect with read access rights of user running the
# wizard, to avoid adding more access than current
for group in current_user.groups_id:
for access_control in group.model_access:
@@ -299,18 +300,18 @@
'model_id' : access_control.model_id.id,
'group_id' : group_id,
'perm_read' : True
- })
+ })
res = []
for rel_field, model in obj0+obj1+obj2+obj3:
if model.id in res:
continue
res.append(model.id)
model_access_obj.create(cr, uid, {
- 'name': 'Read Access of group %s on %s model'%(share_group_name, model.name),
- 'model_id' : model.id,
- 'group_id' : group_id,
- 'perm_read' : True
- })
+ 'name': 'Read Access of group %s on %s model'%(share_group_name, model.name),
+ 'model_id' : model.id,
+ 'group_id' : group_id,
+ 'perm_read' : True
+ })
if access_mode == 'readwrite':
res = []
for rel_field, model in obj0+obj1:
@@ -318,15 +319,15 @@
continue
res.append(model.id)
model_access_obj.create(cr, uid, {
- 'name': 'Write Access of group %s on %s model'%(share_group_name, model.name),
- 'model_id' : model.id,
- 'group_id' : group_id,
- 'perm_read' : True,
- 'perm_write' : True,
- 'perm_unlink' : True,
- 'perm_create' : True,
- })
- # intersect with access rights of user
+ 'name': 'Write Access of group %s on %s model'%(share_group_name, model.name),
+ 'model_id' : model.id,
+ 'group_id' : group_id,
+ 'perm_read' : True,
+ 'perm_write' : True,
+ 'perm_unlink' : True,
+ 'perm_create' : True,
+ })
+ # intersect with access rights of user
# running the wizard, to avoid adding more access than current
for group in current_user.groups_id:
@@ -336,24 +337,24 @@
if access_control.perm_read:
res.append(access_control.model_id.id)
model_access_obj.create(cr, uid, {
- 'name': 'Read Access of group %s on %s model'%(share_group_name, access_control.model_id.name),
- 'model_id' : access_control.model_id.id,
- 'group_id' : group_id,
- 'perm_read' : True
+ 'name': 'Read Access of group %s on %s model'%(share_group_name, access_control.model_id.name),
+ 'model_id' : access_control.model_id.id,
+ 'group_id' : group_id,
+ 'perm_read' : True
})
for rel_field, model in obj2+obj3:
if model.id in res:
continue
res.append(model.id)
model_access_obj.create(cr, uid, {
- 'name': 'Read Access of group %s on %s model'%(share_group_name, model.name),
- 'model_id' : model.id,
- 'group_id' : group_id,
- 'perm_read' : True
+ 'name': 'Read Access of group %s on %s model'%(share_group_name, model.name),
+ 'model_id' : model.id,
+ 'group_id' : group_id,
+ 'perm_read' : True
})
- #
+ #
# And on OBJ0, OBJ1, OBJ2, OBJ3: add all rules from groups of the user
- # that is sharing in the many2many of the rules on the new group
+ # that is sharing in the many2many of the rules on the new group
# (rule must be copied instead of adding it if it contains a reference to uid
# or user.xxx so it can be replaced correctly)
@@ -364,10 +365,11 @@
continue
res.append(model.id)
for rule in group.rule_groups:
- if rule.model_id == model.id:
+ if rule.model_id == model.id:
rule_obj.copy(cr, uid, rule.id, default={
- 'name': '%s-%s'%(share_group_name, model.model),
- 'groups': [(6,0,[group_id])]}, context=context)
+ 'name': '%s-%s'%(share_group_name, model.model),
+ 'groups': [(6,0,[group_id])]
+ }, context=context)
rule_obj.create(cr, uid, {
'name': '%s-%s'%(share_group_name, active_model.model),
@@ -390,23 +392,23 @@
context['share_model'] = active_model.model
context['share_rec_id'] = active_id
-
- data_obj = self.pool.get('ir.model.data')
-
+
+ data_obj = self.pool.get('ir.model.data')
+
form_view = data_obj._get_id(cr, uid, 'share', 'share_result_form')
form_view_id = False
if form_view:
- form_view_id = data_obj.browse(cr, uid, form_view, context=context).res_id
-
-
+ form_view_id = data_obj.browse(cr, uid, form_view, context=context).res_id
+
+
value = {
- 'name': _('Step:4 Share Users Detail'),
- 'view_type': 'form',
- 'view_mode': 'form',
- 'res_model': 'share.result',
- 'view_id': False,
- 'views': [(form_view_id, 'form'), (False, 'tree'), (False, 'calendar'), (False, 'graph')],
- 'type': 'ir.actions.act_window',
+ 'name': _('Step:4 Share Users Detail'),
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'share.result',
+ 'view_id': False,
+ 'views': [(form_view_id, 'form'), (False, 'tree'), (False, 'calendar'), (False, 'graph')],
+ 'type': 'ir.actions.act_window',
'context': context,
'target': 'new'
}
@@ -415,19 +417,19 @@
class share_result(osv.osv_memory):
- _name = "share.result"
+ _name = "share.result"
_columns = {
- 'users': fields.text("Users", readonly=True),
+ 'users': fields.text("Users", readonly=True),
}
-
-
- def do_send_email(self, cr, uid, ids, context=None):
- user_obj = self.pool.get('res.users')
+
+
+ def do_send_email(self, cr, uid, ids, context=None):
+ user_obj = self.pool.get('res.users')
if not context:
context={}
existing_user_ids = context.get('existing_user_ids', [])
- new_user_ids = context.get('new_user_ids', [])
+ new_user_ids = context.get('new_user_ids', [])
share_url = tools.config.get('share_root_url', False)
user = user_obj.browse(cr, uid, uid, context=context)
for share_user in user_obj.browse(cr, uid, new_user_ids+existing_user_ids, context=context):
@@ -436,13 +438,13 @@
body = """
Dear,
- %s wants to share private data from OpenERP with you!
+ %s wants to share private data from OpenERP with you!
"""%(user.name)
if share_url:
body += """
To view it, you can access the following URL:
%s
- """%(user.name, share_url)
+ """%(user.name, share_url)
if share_user.id in new_user_ids:
body += """
You may use the following login and password to get access to this
@@ -454,28 +456,28 @@
body += """
You may use your existing login and password to get access to this
additional data. As a reminder, your login is %s.
- """%(user.name)
+ """%(user.name)
flag = tools.email_send(
user.user_email,
email_to,
subject,
- body
+ body
)
return flag
-
+
def default_get(self, cr, uid, fields, context=None):
- """
+ """
To get default values for the object.
- """
+ """
res = super(share_result, self).default_get(cr, uid, fields, context=context)
- user_obj = self.pool.get('res.users')
+ user_obj = self.pool.get('res.users')
if not context:
context={}
existing_user_ids = context.get('existing_user_ids', [])
- new_user_ids = context.get('new_user_ids', [])
+ new_user_ids = context.get('new_user_ids', [])
share_url = tools.config.get('share_root_url', False)
if 'users' in fields:
users = []
@@ -483,13 +485,13 @@
txt = 'Login: %s Password: %s' %(user.login, user.password)
if share_url:
txt += ' Share URL: %s' %(share_url)
- users.append(txt)
- for user in user_obj.browse(cr, uid, existing_user_ids):
+ users.append(txt)
+ for user in user_obj.browse(cr, uid, existing_user_ids):
txt = 'Login: %s' %(user.login)
if share_url:
txt += ' Share URL: %s' %(share_url)
users.append(txt)
res['users'] = '\n'.join(users)
return res
-
-share_result()
+
+share_result()
=== modified file 'stock/product.py'
--- stock/product.py 2010-07-07 09:05:22 +0000
+++ stock/product.py 2010-08-13 13:36:19 +0000
@@ -149,16 +149,16 @@
product.id,))
amount_diff = qty * -diff
move_line_obj.create(cr, uid, {
- 'name': product.name,
- 'account_id': stock_output_acc,
- 'credit': amount_diff,
- 'move_id': move_id
+ 'name': product.name,
+ 'account_id': stock_output_acc,
+ 'credit': amount_diff,
+ 'move_id': move_id
})
move_line_obj.create(cr, uid, {
- 'name': product.categ_id.name,
- 'account_id': account_variation_id,
- 'debit': amount_diff,
- 'move_id': move_id
+ 'name': product.categ_id.name,
+ 'account_id': account_variation_id,
+ 'debit': amount_diff,
+ 'move_id': move_id
})
self.write(cr, uid, rec_id, {'standard_price': new_price})
=== modified file 'stock/product_view.xml'
--- stock/product_view.xml 2010-07-22 13:28:40 +0000
+++ stock/product_view.xml 2010-08-13 13:36:19 +0000
@@ -33,8 +33,6 @@
</field>
</record>
-
-
<record id="view_template_property_form" model="ir.ui.view">
<field name="name">product.template.stock.property.form.inherit</field>
<field name="model">product.template</field>
@@ -135,6 +133,5 @@
</field>
</record>
-
</data>
</openerp>
=== modified file 'stock/report/report_stock.py'
--- stock/report/report_stock.py 2010-08-05 06:21:57 +0000
+++ stock/report/report_stock.py 2010-08-13 13:36:19 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -29,12 +29,12 @@
_description = "Stock report by production lots"
_auto = False
_columns = {
- 'name': fields.float('Quantity', readonly=True),
- 'location_id': fields.many2one('stock.location', 'Location', readonly=True, select=True),
- 'product_id': fields.many2one('product.product', 'Product', readonly=True, select=True),
- 'prodlot_id': fields.many2one('stock.production.lot', 'Production lot', readonly=True, select=True),
+ 'name': fields.float('Quantity', readonly=True),
+ 'location_id': fields.many2one('stock.location', 'Location', readonly=True, select=True),
+ 'product_id': fields.many2one('product.product', 'Product', readonly=True, select=True),
+ 'prodlot_id': fields.many2one('stock.production.lot', 'Production lot', readonly=True, select=True),
}
-
+
def init(self, cr):
drop_view_if_exists(cr, 'stock_report_prodlots')
cr.execute("""
@@ -73,11 +73,11 @@
) as report
group by location_id, product_id, prodlot_id
)""")
-
+
def unlink(self, cr, uid, ids, context={}):
raise osv.except_osv(_('Error !'), _('You cannot delete any record!'))
-
+
stock_report_prodlots()
class stock_report_tracklots(osv.osv):
@@ -85,17 +85,17 @@
_description = "Stock report by tracking lots"
_auto = False
_columns = {
- 'name': fields.float('Quantity', readonly=True),
- 'location_id': fields.many2one('stock.location', 'Location', readonly=True, select=True),
- 'product_id': fields.many2one('product.product', 'Product', readonly=True, select=True),
- 'tracking_id': fields.many2one('stock.tracking', 'Tracking lot', readonly=True, select=True),
+ 'name': fields.float('Quantity', readonly=True),
+ 'location_id': fields.many2one('stock.location', 'Location', readonly=True, select=True),
+ 'product_id': fields.many2one('product.product', 'Product', readonly=True, select=True),
+ 'tracking_id': fields.many2one('stock.tracking', 'Tracking lot', readonly=True, select=True),
}
-
+
def init(self, cr):
drop_view_if_exists(cr, 'stock_report_tracklots')
cr.execute("""
create or replace view stock_report_tracklots as (
-
+
select max(id) as id,
location_id,
product_id,
=== modified file 'stock/report/report_stock_view.xml'
--- stock/report/report_stock_view.xml 2010-06-21 18:40:58 +0000
+++ stock/report/report_stock_view.xml 2010-08-13 13:36:19 +0000
@@ -49,7 +49,6 @@
</field>
</record>
-
<record model="ir.ui.view" id="report_stock_lines_date_form">
<field name="name">report.stock.lines.date.form</field>
<field name="model">report.stock.lines.date</field>
=== modified file 'stock/stock.py'
--- stock/stock.py 2010-08-10 13:30:50 +0000
+++ stock/stock.py 2010-08-13 13:36:19 +0000
@@ -876,7 +876,7 @@
'origin': (invoice.origin or '') + ', ' + (picking.name or '') + (picking.origin and (':' + picking.origin) or ''),
'comment': (comment and (invoice.comment and invoice.comment+"\n"+comment or comment)) or (invoice.comment and invoice.comment or ''),
'date_invoice':context.get('date_inv',False),
- 'user_id':uid
+ 'user_id':uid
}
invoice_obj.write(cr, uid, [invoice_id], invoice_vals, context=context)
else:
@@ -894,7 +894,7 @@
'date_invoice': context.get('date_inv',False),
'company_id': picking.company_id.id,
'user_id':uid
- }
+ }
cur_id = self.get_currency_id(cr, uid, picking)
if cur_id:
invoice_vals['currency_id'] = cur_id
@@ -957,7 +957,7 @@
'invoice_line_tax_id': [(6, 0, tax_ids)],
'account_analytic_id': account_analytic_id,
'note': notes,
- }, context=context)
+ }, context=context)
self._invoice_line_hook(cr, uid, move_line, invoice_line_id)
invoice_obj.button_compute(cr, uid, [invoice_id], context=context,
@@ -1170,10 +1170,10 @@
}
message = type_list.get(pick.type, _('Document')) + " '" + (pick.name or 'n/a') + "' "
state_list = {
- 'confirmed': "is scheduled for the '" + datetime.strptime(pick.min_date, '%Y-%m-%d %H:%M:%S').strftime('%Y-%m-%d') + "'.",
- 'assigned': 'is ready to process.',
- 'cancel': 'is Cancelled.',
- 'done': 'is processed.',
+ 'confirmed': "is scheduled for the '" + datetime.strptime(pick.min_date, '%Y-%m-%d %H:%M:%S').strftime('%Y-%m-%d') + "'.",
+ 'assigned': 'is ready to process.',
+ 'cancel': 'is Cancelled.',
+ 'done': 'is processed.',
}
message += state_list[pick.state]
self.log(cr, uid, pick.id, message)
@@ -1374,7 +1374,7 @@
'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Order"),
'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin",store=True),
'scraped': fields.related('location_dest_id','scrap_location',type='boolean',relation='stock.location',string='Scraped'),
- 'move_stock_return_history': fields.many2many('stock.move', 'stock_move_return_history', 'move_id', 'return_move_id', 'Move Return History',readonly=True),
+ 'move_stock_return_history': fields.many2many('stock.move', 'stock_move_return_history', 'move_id', 'return_move_id', 'Move Return History',readonly=True),
}
_constraints = [
(_check_tracking,
@@ -1586,7 +1586,7 @@
'invoice_state': 'none',
'date': picking.date,
'sale_id':' sale_id' in picking._columns.keys() and picking.sale_id.id or False
- })
+ })
for move, (loc, auto, delay, journal, company_id, ptype) in todo:
new_id = move_obj.copy(cr, uid, move.id, {
'location_id': move.location_dest_id.id,
@@ -1830,8 +1830,8 @@
'type':'cont_voucher',
'line_id': line,
'ref': move.picking_id and move.picking_id.name,
- })
-
+ })
+
self.write(cr, uid, ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S')})
wf_service = netsvc.LocalService("workflow")
for id in ids:
@@ -1850,25 +1850,25 @@
context = {}
partner_id = move.picking_id.address_id and (move.picking_id.address_id.partner_id and move.picking_id.address_id.partner_id.id or False) or False
lines=[(0, 0, {
- 'name': move.name,
- 'quantity': move.product_qty,
- 'product_id': move.product_id and move.product_id.id or False,
- 'credit': amount,
- 'account_id': account_id,
- 'ref': move.picking_id and move.picking_id.name or False,
- 'date': time.strftime('%Y-%m-%d') ,
- 'partner_id': partner_id,
- }),
- (0, 0, {
- 'name': move.name,
- 'product_id': move.product_id and move.product_id.id or False,
- 'quantity': move.product_qty,
- 'debit': amount,
- 'account_id': account_variation,
- 'ref': move.picking_id and move.picking_id.name or False,
- 'date': time.strftime('%Y-%m-%d') ,
- 'partner_id': partner_id,
- })]
+ 'name': move.name,
+ 'quantity': move.product_qty,
+ 'product_id': move.product_id and move.product_id.id or False,
+ 'credit': amount,
+ 'account_id': account_id,
+ 'ref': move.picking_id and move.picking_id.name or False,
+ 'date': time.strftime('%Y-%m-%d') ,
+ 'partner_id': partner_id,
+ }),
+ (0, 0, {
+ 'name': move.name,
+ 'product_id': move.product_id and move.product_id.id or False,
+ 'quantity': move.product_qty,
+ 'debit': amount,
+ 'account_id': account_variation,
+ 'ref': move.picking_id and move.picking_id.name or False,
+ 'date': time.strftime('%Y-%m-%d') ,
+ 'partner_id': partner_id,
+ })]
return lines
def unlink(self, cr, uid, ids, context=None):
@@ -1906,12 +1906,12 @@
move_qty = move.product_qty
uos_qty = quantity / move_qty * move.product_uos_qty
default_val = {
- 'product_qty': quantity,
- 'product_uos_qty': uos_qty,
- 'state': move.state,
- 'scraped' : True,
- 'location_dest_id': location_id
- }
+ 'product_qty': quantity,
+ 'product_uos_qty': uos_qty,
+ 'state': move.state,
+ 'scraped' : True,
+ 'location_dest_id': location_id
+ }
new_move = self.copy(cr, uid, move.id, default_val)
res += [new_move]
product_obj = self.pool.get('product.product')
=== modified file 'stock/stock_demo.xml'
--- stock/stock_demo.xml 2010-06-11 05:28:32 +0000
+++ stock/stock_demo.xml 2010-08-13 13:36:19 +0000
@@ -37,7 +37,6 @@
<record id="stock_location_14" model="stock.location">
<field name="name">Shelf 2</field>
<field name="location_id" ref="stock_location_13"/>
- <!-- <field model="account.account" name="account_id" search="[('name','=','Merchandise Type B')]"/>-->
</record>
<record id="stock_location_15" model="stock.location">
<field name="name">Sub Products</field>
@@ -242,30 +241,7 @@
<field eval="1" name="active"/>
<field eval=""""Shop 2"""" name="name"/>
</record>
- <!--<record id="res_users_shopuser0" model="res.users">
- <field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
- <field eval="[(6,0,[ref('base.group_user'),ref('stock.group_stock_user')])]" name="groups_id"/>
- <field model="res.partner.address" name="address_id" search="[('name','=','Fabien')]"/>
- <field eval="[(6,0,[])]" name="roles_id"/>
- <field eval="1" name="active"/>
- <field eval=""""shop1"""" name="password"/>
- <field eval=""""en_US"""" name="context_lang"/>
- <field eval=""""Shop 1 User"""" name="name"/>
- <field name="company_id" ref="res_company_shop0"/>
- <field eval=""""shop1"""" name="login"/>
-
Follow ups
