[ADD] estate: New module to manage estates #814
Conversation
|
|
baje-odoo
force-pushed
the
18.0-fix-invoices-baje
branch
2 times, most recently
from
5f9528b to
8bf2ec2
Compare
|
Actually, the |
baje-odoo
force-pushed
the
18.0-fix-invoices-baje
branch
3 times, most recently
from
b008594 to
36574bb
Compare
estate/__manifest__.py
Outdated
| <<<<<<< HEAD | ||
| 'security/ir.model.access.csv', | ||
| 'views/estate_property_views.xml', | ||
| 'views/estate_menus.xml', | ||
| ======= | ||
| 'security/ir.model.access.csv' | ||
| >>>>>>> 6f53f08 (Security) |
There was a problem hiding this comment.
It seems there is an unresolved git conflict here.
estate/models/estate_property.py
Outdated
| living_area = fields.Integer("Living Area") | ||
| living_area = fields.Integer("Living Area (sqm)") | ||
| facades = fields.Integer("Facades") | ||
| garage = fields.Boolean("Garage") | ||
| garden = fields.Boolean("Garden") | ||
| garden_area = fields.Integer("Garden Area") | ||
| garden_area = fields.Integer("Garden Area (sqm)") |
There was a problem hiding this comment.
Maybe these changes can be done in the commit where those lines were initially added.
estate/__manifest__.py
Outdated
| <<<<<<< HEAD | ||
| 'data': [ | ||
| 'security/ir.model.access.csv', | ||
| 'views/estate_property_views.xml', | ||
| 'views/estate_menus.xml', | ||
| ======= | ||
| 'security/ir.model.access.csv' | ||
| >>>>>>> 6f53f08 (Security) | ||
| ], | ||
| 'author': "baje", | ||
| 'category': 'Uncategorized', | ||
| 'description': """ | ||
| An app to manage a Real Estate Agency | ||
| """, | ||
| 'application': True, | ||
| } No newline at end of file | ||
| } |
There was a problem hiding this comment.
Oh ok, it is fixed here. Let's try to make such fixes in their original commit - so that it looks like the problem just never happened.
| <h1> | ||
| <field name="name"/> | ||
| </h1> | ||
| <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}"/> |
There was a problem hiding this comment.
The is no tag_ids field (yet) at this point.
estate/security/ir.model.access.csv
Outdated
| access_estate_property,access_estate_property,model_estate_property,base.group_user,1,1,1,1 No newline at end of file | ||
| access_estate_property,access_estate_property,model_estate_property,base.group_user,1,1,1,1 | ||
| access_estate_property_type,access_estate_property_type,model_estate_property_type,base.group_user,1,1,1,1 |
There was a problem hiding this comment.
Try to introduce a return on the last line on the first version of each file in order to avoid such diffs. (This change should typically only be about adding one new line)
| name = fields.Char("Name", required=True) | ||
|
|
There was a problem hiding this comment.
The warning is still there... I guess your last line is not empty... maybe it contains a few spaces. (This happens in many files)
baje-odoo
force-pushed
the
18.0-fix-invoices-baje
branch
from
a905a17 to
716c663
Compare
baje-odoo
force-pushed
the
18.0-fix-invoices-baje
branch
from
41b9431 to
2a00cff
Compare
baje-odoo
force-pushed
the
18.0-fix-invoices-baje
branch
from
2769e30 to
6871bc9
Compare
baje-odoo
force-pushed
the
18.0-fix-invoices-baje
branch
from
5259f06 to
9a0df1a
Compare
baje-odoo
force-pushed
the
18.0-fix-invoices-baje
branch
4 times, most recently
from
11b3175 to
759af29
Compare
baje-odoo
force-pushed
the
18.0-fix-invoices-baje
branch
from
759af29 to
d5a3567
Compare
No description provided.