Revert "Revert "[IMP] l10n to russian_requisites""

This reverts commit 77b88b9316e0434dd02493f4325c2259d4959b3e.
This commit is contained in:
Stepan Savelyev 2019-12-25 15:52:25 +05:00
parent 77b984b79a
commit f19f69b0cb
3 changed files with 14 additions and 26 deletions

View File

@ -10,7 +10,7 @@
"website": "http://rydlab.ru", "website": "http://rydlab.ru",
"category": "Invoicing & Payments", "category": "Invoicing & Payments",
"version": "0.1.1", "version": "0.1.1",
"depends": ["base", "contacts", "l10n_ru_doc", "sale",], "depends": ["base", "contacts", "russian_requisites", "sale",],
"data": [ "data": [
"data/fields_default.xml", "data/fields_default.xml",
"data/payment_terms.xml", "data/payment_terms.xml",

View File

@ -17,15 +17,6 @@ class ResPartner(models.Model):
compute="_compute_full_address" compute="_compute_full_address"
) # Check for res.partner.contact_address in base/res ) # Check for res.partner.contact_address in base/res
street_actual = fields.Many2one("res.partner", string="Actual Address",) street_actual = fields.Many2one("res.partner", string="Actual Address",)
passport_authority = fields.Char(
string="Passport Authority", help="What Department issued the passport",
)
passport_date = fields.Date(
string="Passport Issue Date", help="Date when receive a passport",
)
passport_number = fields.Char(string="Passport Number",)
passport_series = fields.Char(string="Passport Series",)
psrn = fields.Char(string="PSRN", help="Primary State Registration Number",)
representative_id = fields.Many2one( representative_id = fields.Many2one(
"res.partner", string="Representative", help="Person, who represents company" "res.partner", string="Representative", help="Person, who represents company"
) )

View File

@ -44,33 +44,30 @@
<xpath expr="//field[@name='category_id']" position="after"> <xpath expr="//field[@name='category_id']" position="after">
<field name="representative_id" domain="[('company_type', '=', 'person')]" attrs="{'invisible': [('company_type', '!=', 'company')]}"/> <field name="representative_id" domain="[('company_type', '=', 'person')]" attrs="{'invisible': [('company_type', '!=', 'company')]}"/>
<field name="passport_series" attrs="{'invisible': [('company_type', '=', 'company')]}"/>
<field name="passport_number" attrs="{'invisible': [('company_type', '=', 'company')]}"/>
<field name="passport_date" attrs="{'invisible': [('company_type', '=', 'company')]}"/>
<field name="passport_authority" attrs="{'invisible': [('company_type', '=', 'company')]}"/>
<field name="signature" widget="image"/> <field name="signature" widget="image"/>
</xpath> </xpath>
<xpath expr="//field[@name='okpo']" position="after"> <xpath expr="//page[@name='internal_notes']" position="before">
<field name="psrn" attrs="{'invisible': [('company_type', '=', 'person')]}"/> <page string="Banks" name="banks">
<field name="bank_ids" attrs="{'invisible': [('company_type', '=', 'person')]}"> <group>
<tree> <field name="bank_ids" attrs="{'invisible': [('company_type', '=', 'person')]}">
<field name="acc_number"/> <tree>
<field name="bank_id"/> <field name="acc_number"/>
</tree> <field name="bank_id"/>
</field> </tree>
</field>
</group>
</page>
</xpath> </xpath>
<xpath expr="//field[@name='vat']" position="before"> <!-- <xpath expr="//field[@name='vat']" position="before">
<field name="street_actual"/> <field name="street_actual"/>
</xpath> </xpath> -->
<xpath expr="//field[@name='function']" position="after"> <xpath expr="//field[@name='function']" position="after">
<field name="function_parent_case" attrs="{'invisible': [('is_company','=', True)]}"/> <field name="function_parent_case" attrs="{'invisible': [('is_company','=', True)]}"/>