tzaustria
/
odoo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

develop
Ahmed Aly 2018-09-07 12:49:50 +02:00
parent 9e034547d9 a602a65275
commit 9c83258ee8
6 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/odoo-server-dev-rw.conf
View File

@ -8,7 +8,7 @@ db_port = 5432
db_user = False db_user = False
db_password = False db_password = False
addons_path = ext/odoo/addons,ext/3rd-party-addons,ext/custom-addons addons_path = ext/odoo/addons,ext/3rd-party-addons,ext/custom-addons,ext/clarico-addons
; For enterprise use the addons path bellow ; For enterprise use the addons path bellow
; addons_path = ext/enterprise-addons,ext/odoo/addons,ext/3rd-party-addons,ext/custom-addons,dmi/run1 ; addons_path = ext/enterprise-addons,ext/odoo/addons,ext/3rd-party-addons,ext/custom-addons,dmi/run1
timezone = Europe/Vienna timezone = Europe/Vienna

11
dev/pylint/setup_pylint_hook
View File

@ -1,21 +1,14 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if ! $(python -c "import pylint" &> /dev/null); then
echo 'Pylint is not installed and is going to be installed now!'
sudo pip install pylint
else
echo 'Pylint is already installed. Continue ...'
fi
if ! $(python -c "import pylint_odoo" &> /dev/null); then if ! $(python -c "import pylint_odoo" &> /dev/null); then
echo 'The pylint module "pylint-odoo" is not installed and is going to be installed now!' echo 'The pylint module "pylint-odoo" is not installed and is going to be installed now!'
sudo pip install --upgrade git+https://github.com/oca/pylint-odoo.git sudo pip3 install --upgrade git+https://github.com/oca/pylint-odoo.git
else else
echo 'The pylint module "pylint-odoo" is already installed. Continue ...' echo 'The pylint module "pylint-odoo" is already installed. Continue ...'
fi fi
if ! $(python -c "import git_pylint_commit_hook" &> /dev/null); then if ! $(python -c "import git_pylint_commit_hook" &> /dev/null); then
echo 'git-pylint-commit-hook is not insalled and is going to be isntalled now!' echo 'git-pylint-commit-hook is not insalled and is going to be isntalled now!'
sudo pip install git-pylint-commit-hook sudo pip3 install git-pylint-commit-hook
else else
echo 'git-pylint-commit-hook is already installed. Continue ...' echo 'git-pylint-commit-hook is already installed. Continue ...'
fi fi

2
ext/custom-addons/dp_custom/models/account.py
View File

@ -37,7 +37,7 @@ class AccountInvoiceLine(models.Model):
if vals.get('lot_id', False): if vals.get('lot_id', False):
vals.update(intrastat_id=self.env['stock.production.lot'].browse(vals['lot_id']).intrastat_id.id) vals.update(intrastat_id=self.env['stock.production.lot'].browse(vals['lot_id']).intrastat_id.id)
elif vals.get('product_id', False): elif vals.get('product_id', False):
vals.update(intrastat_id=self.env['product.template'].browse(vals['product_id']).intrastat_id.id) vals.update(intrastat_id=self.env['product.product'].browse(vals['product_id']).intrastat_id.id)
return super(AccountInvoiceLine, self).create(vals) return super(AccountInvoiceLine, self).create(vals)
@api.multi @api.multi

6
ext/custom-addons/dp_custom/models/stock.py
View File

@ -36,12 +36,14 @@ class StockProductionLot(models.Model):
@api.model @api.model
def create(self, vals): def create(self, vals):
tools.image_resize_images(vals) if vals.get('image'):
vals.update(tools.image_get_resized_images(vals['image'], return_big=True, return_medium=True, return_small=False))
return super(StockProductionLot, self).create(vals) return super(StockProductionLot, self).create(vals)
@api.multi @api.multi
def write(self, vals): def write(self, vals):
tools.image_resize_images(vals) if vals.get('image'):
vals.update(tools.image_get_resized_images(vals['image'], return_big=True, return_medium=True, return_small=False))
return super(StockProductionLot, self).write(vals) return super(StockProductionLot, self).write(vals)

5
ext/custom-addons/dp_reports_sale/reports/sale.xml
View File

@ -110,7 +110,7 @@
<p t-if="o.note1"> <p t-if="o.note1">
<span t-field="o.note1"/> <span t-field="o.note1"/>
</p> </p>
<table class="table table-condensed"> <table class="table table-condensed" style="background-color: #E6E7E9;">
<t t-set="discount_is_set" t-value="field_set_in_lines(o.order_line, 'discount')"/> <t t-set="discount_is_set" t-value="field_set_in_lines(o.order_line, 'discount')"/>
<thead class="table-header"> <thead class="table-header">
<tr> <tr>
@ -143,8 +143,7 @@
kg kg
</t> </t>
</td> </td>
<td class="text-right"> <td class="text-right"/>
</td>
<td rowspan="2" class="text-left"> <td rowspan="2" class="text-left">
<t t-if="order_line.product_id.default_code and order_line.product_id.material_type_id.print_default_code"> <t t-if="order_line.product_id.default_code and order_line.product_id.material_type_id.print_default_code">
<strong> <strong>

8
ext/custom-addons/dp_sale_delivery_date/models/sale_order_line.py
View File

@ -23,7 +23,9 @@ class SaleOrderLine(models.Model):
def _inverse_delivery_date(self): def _inverse_delivery_date(self):
for line in self: for line in self:
stock_move = self.env['stock.move'] stock_move = self.env['stock.move']
move = stock_move.search([('sale_line_id', '=', line.id), ('state', 'not in', ['cancel'])]) move = stock_move.search([('sale_line_id', '=', line.id), ('state', 'not in', ['cancel', 'done'])])
if move: if move:
move.date = line.delivery_date move.write({
move.date_expected = line.delivery_date 'date': line.delivery_date,
'date_expected': line.delivery_date
})