clearcorp team mailing list archive
-
clearcorp team
-
Mailing list archive
-
Message #00191
lp:~rr.clearcorp/openerp-ccorp-addons/6.1-account_multicompany_relation_feature into lp:openerp-ccorp-addons
Ronald Rubi has proposed merging lp:~rr.clearcorp/openerp-ccorp-addons/6.1-account_multicompany_relation_feature into lp:openerp-ccorp-addons.
Requested reviews:
CLEARCORP drivers (clearcorp-drivers)
For more details, see:
https://code.launchpad.net/~rr.clearcorp/openerp-ccorp-addons/6.1-account_multicompany_relation_feature/+merge/112664
[FIX] Create domain for search the mirror relation correctly
[DEL] Delete field mirror relation in account and journal
--
https://code.launchpad.net/~rr.clearcorp/openerp-ccorp-addons/6.1-account_multicompany_relation_feature/+merge/112664
Your team CLEARCORP development team is subscribed to branch lp:openerp-ccorp-addons.
=== modified file 'account_multicompany_relation/account_multicompany_relation.py'
--- account_multicompany_relation/account_multicompany_relation.py 2012-06-28 02:13:58 +0000
+++ account_multicompany_relation/account_multicompany_relation.py 2012-06-28 22:40:25 +0000
@@ -30,24 +30,22 @@
'origin_journal' : fields.many2one('account.journal', 'Original Journal',help='Indicate the original journal where the transaction is taking place'),
'targ_journal' : fields.many2one('account.journal', 'Target Journal',help='Indicate the original account where the transaction is taking place'),
}
+
+ _sql_constraints = [
+ (
+ 'unique_name',
+ 'unique(name)',
+ 'The name must be unique'
+ ),
+ (
+ 'unique_journal_account_origins',
+ 'unique(origin_account,origin_journal)',
+ 'Already exist a relation to this diary and account (origins)'
+ )
+ ]
+
account_multicompany_relation()
-class account_journal(osv.osv):
- _name = 'account.journal'
- _inherit = 'account.journal'
- _columns = {
- 'journal_mirror' : fields.many2one('account.multicompany.relation','Mirror Relation'),
- }
-account_journal()
-
-class account_account(osv.osv):
- _name = 'account.account'
- _inherit = 'account.account'
- _columns = {
- 'account_mirror' : fields.many2one('account.multicompany.relation','Mirror Relation'),
- }
-account_account()
-
class account_voucher_journal_payment(osv.osv):
_name = 'account.voucher'
_inherit = 'account.voucher'
@@ -56,9 +54,11 @@
def proforma_voucher(self, cr, uid, ids, context=None):
result = super(account_voucher_journal_payment, self).action_move_line_create(cr, uid, ids, context=context)
voucher = self.browse(cr,1,ids,context=context)[0]
- if voucher.journal_id.journal_mirror:
- mirror_journal = voucher.journal_id.journal_mirror
-
+ cuenta = voucher.account_id.id
+ diario = voucher.journal_id.id
+ mirror_journal_id = self.pool.get('account.multicompany.relation').search(cr, 1, [('origin_account', '=', cuenta), ('origin_journal', '=', diario)], context=context)[0]
+ if mirror_journal_id:
+ mirror_journal = self.pool.get('account.multicompany.relation').browse(cr, 1, [mirror_journal_id], context=context)[0]
origin_journal = mirror_journal.origin_journal
origin_account = mirror_journal.origin_account
targ_journal = mirror_journal.targ_journal
@@ -143,7 +143,9 @@
}
self.pool.get('account.move.line').create(cr, 1, move_line_two)
- self.pool.get('account.move').post(cr, 1, [move_id], context={})
+
+ if (targ_journal.entry_posted):
+ self.pool.get('account.move').post(cr, 1, [move_id], context={})
return result
account_voucher_journal_payment()
=== modified file 'account_multicompany_relation/account_multicompany_relation.xml'
--- account_multicompany_relation/account_multicompany_relation.xml 2012-06-28 02:13:58 +0000
+++ account_multicompany_relation/account_multicompany_relation.xml 2012-06-28 22:40:25 +0000
@@ -1,97 +1,46 @@
<openerp>
- <data>
-
- <!-- Account voucher payment and purchase inherit -->
-
- <record model="ir.ui.view" id="view_account_multi_relation">
- <field name="name">account.multicompany.relation.form</field>
- <field name="model">account.multicompany.relation</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string = "Account Multicompany Relation">
- <field name = "name"/>
- <field name = "origin_account"/>
- <field name = "targ_account"/>
- <field name = "origin_journal"/>
- <field name = "targ_journal"/>
- </form>
- </field>
- </record>
-
- <record model="ir.ui.view" id="view_account_multi_relation_tree">
- <field name="name">account.multicompany.relation.tree</field>
- <field name="model">account.multicompany.relation</field>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <tree string = "Account Multicompany Relation" editable = "bottom">
- <field name = "name"/>
- <field name = "origin_account"/>
- <field name = "targ_account"/>
- <field name = "origin_journal"/>
- <field name = "targ_journal"/>
- </tree>
- </field>
- </record>
-
- <!--<record id="action_account_multi_relation" model="ir.actions.act_window">
- <field name="name">Account Multicompany Relation</field>
- <field name="res_model">account.multicompany.relation</field>
- <field name="view_type">form</field>
- <field name="view_id" eval="False"/>
- <field name="target">current</field>
- <field name="help">The account multicompany relation form allows you to create a connection between two companies that have payments and need to alter an account from one company to another</field>
- </record>
- <record id="action_account_multi_relation_tree" model="ir.actions.act_window.view">
- <field eval="1" name="sequence"/>
- <field name="view_mode">tree</field>
- <field name="view_id" ref="view_account_multi_relation_tree"/>
- <field name="act_window_id" ref="action_account_multi_relation"/>
- </record>
- <record id="action_account_multi_relation_form" model="ir.actions.act_window.view">
- <field eval="2" name="sequence"/>
- <field name="view_mode">form</field>
- <field name="view_id" ref="view_account_multi_relation"/>
- <field name="act_window_id" ref="action_account_multi_relation"/>
- </record>
- -->
- <record id="action_account_multi_relation_fix" model="ir.actions.act_window">
- <field name="name">Account Multicompany Relation</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">account.multicompany.relation</field>
- <field name="view_type">form</field>
- <field name="view_id" ref="view_account_multi_relation_tree"/>
- </record>
- <menuitem id = "account_multi_relation_menu" name = "Relation Multicompany" parent="account.menu_configuration_misc" action = "action_account_multi_relation_fix"/>
-
-
-
- <record model="ir.ui.view" id="view_account_account_mirror_ext">
- <field name="name">account.account.relation.form</field>
- <field name="model">account.account</field>
- <field name="type">form</field>
- <field name="inherit_id" ref = "account.view_account_form"/>
- <field name="arch" type="xml">
- <data>
- <field name = "user_type" position = "after">
- <field name = "account_mirror"/>
- </field>
- </data>
- </field>
- </record>
-
-
- <record model="ir.ui.view" id="view_account_journal_mirror_ext">
- <field name="name">account.journal.relation.form2</field>
- <field name="model">account.journal</field>
- <field name="type">form</field>
- <field name="inherit_id" ref = "account.view_account_journal_form"/>
- <field name="arch" type="xml">
- <data>
- <field name = "type" position = "after">
- <field name = "journal_mirror"/>
- </field>
- </data>
- </field>
- </record>
- </data>
+ <data>
+
+ <!-- Account multicompany relation -->
+
+ <record model="ir.ui.view" id="view_account_multi_relation">
+ <field name="name">account.multicompany.relation.form</field>
+ <field name="model">account.multicompany.relation</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string = "Account Multicompany Relation">
+ <field name = "name"/>
+ <field name = "origin_account"/>
+ <field name = "targ_account"/>
+ <field name = "origin_journal"/>
+ <field name = "targ_journal"/>
+ </form>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="view_account_multi_relation_tree">
+ <field name="name">account.multicompany.relation.tree</field>
+ <field name="model">account.multicompany.relation</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <tree string = "Account Multicompany Relation" editable = "bottom">
+ <field name = "name"/>
+ <field name = "origin_account"/>
+ <field name = "targ_account"/>
+ <field name = "origin_journal"/>
+ <field name = "targ_journal"/>
+ </tree>
+ </field>
+ </record>
+
+ <record id="action_account_multi_relation_fix" model="ir.actions.act_window">
+ <field name="name">Account Multicompany Relation</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">account.multicompany.relation</field>
+ <field name="view_type">form</field>
+ <field name="view_id" ref="view_account_multi_relation_tree"/>
+ </record>
+ <menuitem id = "account_multi_relation_menu" name = "Relation Multicompany" parent="account.menu_configuration_misc" action = "action_account_multi_relation_fix"/>
+
+ </data>
</openerp>
Follow ups
