+
+ + Click to add a reconciliation profile. +
+ A reconciliation profile specifies, for one account, how + the entries should be reconciled. + You can select one or many reconciliation methods which will + be run sequentially to match the entries between them. +
+
+
+
+
+
+ ' + + _t('The dispensed amount was: ') + res + ) + }); + } + // register accounting + self.pos.action_take_money_out(res, _t('Manual: take money out')).then(function(st_line) { + print_lines.push(_t('Dispensed: ') + self.format_currency(res)); + self.pos.proxy.print_receipt(QWeb.render('AutomaticCashdrawerActionXmlReport', { + pos: self.pos, + report: { + name: _t('Cash Withdrawal'), + lines: print_lines, + st_line: st_line, + } + })); + }); + }).always(function() { + framework.unblockUI(); + }); + }, + }); + }); + }, + + action_cancel: function() { + var self = this; + this.pos.proxy.automatic_cashdrawer_stop_acceptance() + .then(function(res) { + self.pos.proxy.print_receipt(QWeb.render('AutomaticCashdrawerActionXmlReport', { + pos: self.pos, + report: { + name: _t('Manual Cancel'), + lines: [ + _t('Money in/out: ') + self.format_currency(res), + _t('IMPORTANT: This operations is not registered on the cash statement. You have to manually register it.') + ], + } + })); + }); + }, + + action_close_till: function() { + var self = this; + this.pos.check_cash_in_out_possible().fail(function(error) { + console.error(error); + self.gui.close_popup() + self.gui.show_popup('error', { + title: _t('Cash In/Out not possible'), + body: error.data.message, + }); + }).then(function() { + self.pos.proxy.automatic_cashdrawer_display_close_till().then(function(res) { + if (res['added']) { + self.pos.action_put_money_in(res['added'], _t('Automatic Cashdrawer: Close Till / ADDED')).then(function(st_line) { + self.pos.proxy.print_receipt(QWeb.render('AutomaticCashdrawerActionXmlReport', { + pos: self.pos, + report: { + name: _t('Close Till: Put In'), + lines: [ + _t('Total added: ') + self.format_currency(res['added']), + ], + st_line: st_line, + } + })); + }) + } + if (res['dispensed']) { + self.pos.action_take_money_out(res['dispensed'], _t('Automatic Cashdrawer: Close Till / DISPENSED')).then(function(st_line) { + self.pos.proxy.print_receipt(QWeb.render('AutomaticCashdrawerActionXmlReport', { + pos: self.pos, + report: { + name: _t('Close Till Result'), + lines: [ + _t('Total dispensed: ') + self.format_currency(res['dispensed']), + ], + st_line: st_line, + } + })); + }) + } + }); + }); + }, + + action_empty_stacker: function() { + var self = this; + this.pos.check_cash_in_out_possible().fail(function(error) { + console.error(error); + self.gui.close_popup() + self.gui.show_popup('error', { + title: _t('Cash In/Out not possible'), + body: error.data.message, + }); + }).then(function() { + self.pos.proxy.automatic_cashdrawer_display_empty_stacker().then(function(res) { + if (res) { + self.pos.action_take_money_out(res, _t('Automatic Cashdrawer: Empty Stacker')).then(function(st_line) { + self.pos.proxy.print_receipt(QWeb.render('AutomaticCashdrawerActionXmlReport', { + pos: self.pos, + report: { + name: _t('Empty Stacker'), + lines: [ + _t('Total dispensed: ') + self.format_currency(res), + ], + st_line: st_line, + } + })); + }) + } + }); + }); + }, + + action_complete_emptying: function() { + var self = this; + this.pos.check_cash_in_out_possible().fail(function(error) { + console.error(error); + self.gui.close_popup() + self.gui.show_popup('error', { + title: _t('Cash In/Out not possible'), + body: error.data.message, + }); + }).then(function() { + self.pos.proxy.automatic_cashdrawer_display_complete_emptying().then(function(res) { + if (res) { + self.pos.action_take_money_out(res, _t('Automatic Cashdrawer: Complete Emptying')).then(function(st_line) { + self.pos.proxy.print_receipt(QWeb.render('AutomaticCashdrawerActionXmlReport', { + pos: self.pos, + report: { + name: _t('Complete Emptying'), + lines: [ + _t('Total dispensed: ') + self.format_currency(res), + ], + st_line: st_line, + } + })); + }); + } + }); + }); + }, + + action_sync_opening_balance: function() { + var self = this; + this.pos.check_opening_balance_missing().then(function(res) { + if (res == true) { + self.pos.proxy.automatic_cashdrawer_get_inventory().then(function(res) { + self.pos.action_set_balance(res.total, 'start') + .then(function(res) { + self.gui.show_popup('alert', { + title: _t('Opening Balance Set'), + body: _t('Success'), + }); + }); + }); + } else { + self.gui.show_popup('error', { + title: _t('Unable to set balance on opened sessions'), + body: _t('It looks the session is already opened'), + }); + }; + }); + }, + + action_sync_closing_balance: function() { + var self = this; + this.pos.proxy.automatic_cashdrawer_get_inventory().then(function(res) { + self.pos.action_set_balance(res.total, 'end').then(function(res) { + self.gui.show_popup('alert', { + title: _t('Closing Balance Set'), + body: _t('Success'), + }); + }); + }); + }, + + }); + + + var AutomaticCashDrawerCashInDialog = PopupWidget.extend({ + template: 'AutomaticCashdrawerCashInDialog', + + show: function(options) { + var self = this; + this._super.apply(this, arguments); + this.inputbuffer = 0.00; + + framework.blockUI(); + this.pos.proxy.automatic_cashdrawer_start_add_change().then(function(res) { + self.update_counter(); + }).fail(function(err) { + self.close(); + }).always(function() { + framework.unblockUI(); + }); + }, + + close: function(options) { + if (this.timer) { clearTimeout(this.timer); } + this._super.apply(this, arguments); + }, + + update_counter: function() { + var self = this; + this.pos.proxy.automatic_cashdrawer_get_amount_accepted().then(function(res) { + console.log('Update counter', res); + self.inputbuffer = res; + self.$('.value').text(self.format_currency(self.inputbuffer)); + self.timer = setTimeout(function() { self.update_counter(); }, 500); + }); + }, + + click_confirm: function() { + var self = this; + this._super.apply(this, arguments); + this.pos.proxy.automatic_cashdrawer_stop_acceptance().then(function(res) { + self.pos.action_put_money_in(res, _t('Manual: put money in')).then(function(st_line) { + self.pos.proxy.print_receipt(QWeb.render('AutomaticCashdrawerActionXmlReport', { + pos: self.pos, + report: { + name: _t('Added Cash'), + lines: [ + _t('Total added: ') + self.format_currency(res), + ], + st_line: st_line, + } + })); + }); + }); + }, + + /* + TODO: shuold return the money inserted (maybe) + So, basically, we confirm the operation to the machine, and then we dispense + the inserted amount. + */ + click_cancel: function() { + this.gui.show_popup('error', { message: 'Not implemented yet' }); + this._super.apply(this, arguments); + }, + }) + + + gui.define_popup({name:'cashdrawer_admin', widget: AutomaticCashdrawerAdminDialog}); + gui.define_popup({name:'cashdrawer_cash_in', widget: AutomaticCashDrawerCashInDialog}); + + + var AutomaticCashdrawerInventoryDialog = PopupWidget.extend({ + template: 'AutomaticCashdrawerInventoryDialog', + + init: function(options) { + this._super.apply(this, arguments); + this.inventory_total = 0.00; + this.inventory = { total: {}, stacker: {}, recycler: {} }; + this.sorted_values = []; + }, + + show: function(options) { + this._super.apply(this, arguments); + var self = this; + // Get information from driver and delays showing + framework.blockUI(); + $.when( + this.pos.proxy.automatic_cashdrawer_get_total_amount(), + this.pos.proxy.automatic_cashdrawer_get_inventory(), + ).then(function(totals, inventory) { + self.inventory_total = totals.total; + self.totals = totals; + self.inventory = inventory; + self.sorted_values = Object.keys(self.inventory.total).sort(function(a, b){ return Number(b) - Number(a) }); + self.renderElement(); + }).fail(function() { + self.close(); + }).always(function() { + framework.unblockUI(); + }); + }, + + to_num: function(v) { + return Number(v); + }, + + click_confirm: function() { + var self = this; + this.pos.proxy.print_receipt(QWeb.render('AutomaticCashdrawerInventoryXmlReport', { + widget: this, + pos: this.pos, + report: { + totals: this.totals, + inventory: this.inventory, + sorted_values: this.sorted_values, + date: false, // todo + } + })); + return this._super.apply(this, arguments); + }, + + click_cancel: function() { + return this._super.apply(this, arguments); + }, + }); + + gui.define_popup({name: 'cashdrawer_inventory', widget: AutomaticCashdrawerInventoryDialog}); + + return { + AutomaticCashdrawerConfigWidget: AutomaticCashdrawerConfigWidget, + AutomaticCashdrawerAdminDialog: AutomaticCashdrawerAdminDialog, + AutomaticCashDrawerCashInDialog: AutomaticCashDrawerCashInDialog, + AutomaticCashdrawerInventoryDialog: AutomaticCashdrawerInventoryDialog, + }; + +}); diff --git a/extra_addons/pos_automatic_cashdrawer/static/src/xml/pos_automatic_cashdrawer.xml b/extra_addons/pos_automatic_cashdrawer/static/src/xml/pos_automatic_cashdrawer.xml index de2b61be10..d60a8dcdfb 100644 --- a/extra_addons/pos_automatic_cashdrawer/static/src/xml/pos_automatic_cashdrawer.xml +++ b/extra_addons/pos_automatic_cashdrawer/static/src/xml/pos_automatic_cashdrawer.xml @@ -1,60 +1,227 @@
-
-
+
+
-
-
+
+
+
+
Start adding cash into the machine.
+When you finish, press confirm.
+
+ 0.00
+
+
+
Added so far
+
-
@@ -354,15 +356,14 @@
/>
+ groups="coop_membership.group_membership_access_user">
@@ -700,10 +698,6 @@
-
+ groups="coop_shift.group_shift_see_counter,coop_membership.group_membership_bdm_lecture">
+ groups="coop_shift.group_shift_see_counter,coop_membership.group_membership_access_user,coop_membership.group_membership_bdm_lecture">
@@ -826,7 +830,7 @@
+ groups="coop_shift.group_shift_manager">
@@ -1265,7 +1280,7 @@ coop_membership.group_membership_access_user,coop_membership.group_membership_bd
-
- red:reduce_deduction==True;
+ red:reduce_deduction==True;
+ blue:current_extension==True
diff --git a/intercoop_addons/coop_membership/wizard/capital_fundraising_wizard.py b/intercoop_addons/coop_membership/wizard/capital_fundraising_wizard.py
index f218f9316a..0937cac7b8 100644
--- a/intercoop_addons/coop_membership/wizard/capital_fundraising_wizard.py
+++ b/intercoop_addons/coop_membership/wizard/capital_fundraising_wizard.py
@@ -39,25 +39,29 @@ def default_category_id(self):
@api.multi
def button_confirm(self):
self.ensure_one()
- barcode_rule_obj = self.env['barcode.rule']
- wizard = self[0]
- if (wizard.category_id.is_worker_capital_category and
- wizard.partner_id.is_associated_people):
+ if (
+ self.category_id.is_worker_capital_category
+ and self.partner_id.is_associated_people
+ ):
# If the partner is currently associated, make him cooperator
- wizard.partner_id.parent_id = False
+ self.partner_id.parent_id = False
# Remove number
- wizard.partner_id.barcode_rule_id = False
- wizard.partner_id.barcode_base = False
-
- if (wizard.category_id.is_worker_capital_category and
- not wizard.partner_id.barcode_rule_id and
- not wizard.partner_id.barcode_base):
- # Add the barcode rule
- barcode_rule_id = barcode_rule_obj.search(
+ self.partner_id.barcode_rule_id = False
+ self.partner_id.barcode_base = False
+ res = super(CapitalFundraisingWizard, self).button_confirm()
+ # Add the barcode rule
+ # We do it after calling super so that the sequence is assigned
+ # at the very last moment, hence avoiding consuming numbers in
+ # case of exception.
+ if (
+ self.category_id.is_worker_capital_category
+ and not self.partner_id.barcode_rule_id
+ and not self.partner_id.barcode_base
+ ):
+ barcode_rule_id = self.env['barcode.rule'].search(
[('for_type_A_capital_subscriptor', '=', True)], limit=1)
if barcode_rule_id and barcode_rule_id.generate_type == 'sequence':
- wizard.partner_id.barcode_rule_id = barcode_rule_id.id
- wizard.partner_id.generate_base()
- wizard.partner_id.generate_barcode()
- return super(CapitalFundraisingWizard, self).button_confirm()
-
+ self.partner_id.barcode_rule_id = barcode_rule_id.id
+ self.partner_id.generate_base()
+ self.partner_id.generate_barcode()
+ return res
diff --git a/intercoop_addons/coop_memberspace/models/res_users.py b/intercoop_addons/coop_memberspace/models/res_users.py
index e6def68b1a..d27b50ffdf 100644
--- a/intercoop_addons/coop_memberspace/models/res_users.py
+++ b/intercoop_addons/coop_memberspace/models/res_users.py
@@ -67,6 +67,7 @@ def ftop_get_shift(self):
continue
shifts.append({
'id': shift.id,
+ 'week_number': shift.week_number,
'seats_avail': seats_avail,
'date_begin': user.get_time_by_user_lang(
shift.date_begin, ['%A, %d %B', '%HH%M'],
diff --git a/intercoop_addons/coop_memberspace/static/src/js/programmer_une_vacation.js b/intercoop_addons/coop_memberspace/static/src/js/programmer_une_vacation.js
index e7d45dc07d..d23046574a 100644
--- a/intercoop_addons/coop_memberspace/static/src/js/programmer_une_vacation.js
+++ b/intercoop_addons/coop_memberspace/static/src/js/programmer_une_vacation.js
@@ -24,12 +24,22 @@ odoo.define('coop_memberspace.programmer_une_vacation', function (require) {
new Model('res.users').call('ftop_get_shift')
.then(function(shifts) {
shifts.forEach(function(shift, idx, array) {
+ var week_number = shift.week_number;
+ var dict_week_number = {
+ 1: 'A', 2: 'B', 3: 'C', 4: 'D'
+ };
+ if (week_number && dict_week_number[week_number]){
+ week_number = dict_week_number[week_number];
+ }
$('.body_ftop_programmer').append(
`
${shift.date_begin[0] + ' '}
${shift.date_begin[1]}
+
+ ${week_number || ''}
+
${shift.date_begin[1]}
${shift.seats_avail}
Date
+ Semaine
Heure
Places disponibles
Inscription
@@ -334,6 +335,7 @@
+
Date
+ Semaine
Heure
Places disponibles
Inscription
diff --git a/intercoop_addons/coop_print_badge/i18n/fr.po b/intercoop_addons/coop_print_badge/i18n/fr.po
index c0d77d6685..bda79a819e 100644
--- a/intercoop_addons/coop_print_badge/i18n/fr.po
+++ b/intercoop_addons/coop_print_badge/i18n/fr.po
@@ -23,7 +23,7 @@ msgstr "Dernière modification le"
#. module: coop_print_badge
#: model:ir.actions.report.xml,name:coop_print_badge.action_report_printbadge
msgid "Print Badge"
-msgstr "Imprimer Badge"
+msgstr "Imprimer badge"
#. module: coop_print_badge
#: model:ir.model,name:coop_print_badge.model_report_coop_print_badge_report_printbadge
@@ -43,7 +43,7 @@ msgstr "RATTACHÉ(E)"
#. module: coop_print_badge
#: model:ir.model,name:coop_print_badge.model_res_partner
msgid "Badges To Print"
-msgstr "Badges à imprimer"
+msgstr "Badges à distribuer"
#. module: coop_print_badge
#: model:ir.ui.menu,name:coop_print_badge.menu_badge_to_print
@@ -66,3 +66,9 @@ msgstr "Impression du badge"
#: model:ir.model.fields,field_description:coop_print_badge.field_res_partner_badge_to_print
msgid "Badge To Print"
msgstr "Badge à imprimer"
+
+#. module: coop_print_badge
+#: model:ir.ui.menu,name:coop_print_badge.menu_badge_to_distribute
+#: model:ir.actions.act_window,name:coop_print_badge.action_badge_to_distribute
+msgid "Badges"
+msgstr "Badges à récupérer"
diff --git a/intercoop_addons/coop_product_coefficient/views/view_product_template.xml b/intercoop_addons/coop_product_coefficient/views/view_product_template.xml
index 8eba7a88d5..a8b14823b4 100644
--- a/intercoop_addons/coop_product_coefficient/views/view_product_template.xml
+++ b/intercoop_addons/coop_product_coefficient/views/view_product_template.xml
@@ -9,6 +9,7 @@
product.template
+ 100
-
-
diff --git a/intercoop_addons/coop_purchase/models/account_product_fiscal_classification.py b/intercoop_addons/coop_purchase/models/account_product_fiscal_classification.py
index 5f4beab29b..c0459b076a 100644
--- a/intercoop_addons/coop_purchase/models/account_product_fiscal_classification.py
+++ b/intercoop_addons/coop_purchase/models/account_product_fiscal_classification.py
@@ -5,25 +5,18 @@
class AccountProductFiscalClassification(models.Model):
_inherit = 'account.product.fiscal.classification'
+ # TODO: this should be company_dependant
income_account_id = fields.Many2one(
- comodel_name='account.account',
+ 'account.account',
string='Income Account',
- required=True
)
+
+ # TODO: this should be company_dependant
expense_account_id = fields.Many2one(
- comodel_name='account.account',
+ 'account.account',
string='Expense Account',
- required=True
- )
- sale_tax_ids = fields.Many2many(
- comodel_name='account.tax',
- relation='fiscal_classification_sale_tax_rel',
- column1='fiscal_classification_id', column2='tax_id',
- required=True
- )
- purchase_tax_ids = fields.Many2many(
- comodel_name='account.tax',
- relation='fiscal_classification_purchase_tax_rel',
- column1='fiscal_classification_id', column2='tax_id',
- required=True
)
+
+ # Make tax required
+ sale_tax_ids = fields.Many2many(required=True)
+ purchase_tax_ids = fields.Many2many(required=True)
diff --git a/intercoop_addons/coop_purchase/models/product_template.py b/intercoop_addons/coop_purchase/models/product_template.py
index 65004b03c5..9fbc5730b9 100644
--- a/intercoop_addons/coop_purchase/models/product_template.py
+++ b/intercoop_addons/coop_purchase/models/product_template.py
@@ -1,61 +1,78 @@
# -*- coding: utf-8 -*-
-from openerp import api, models
+from openerp import api, models, fields
class ProductTemplate(models.Model):
_inherit = 'product.template'
+ is_expense_account_readonly = fields.Boolean(
+ compute='_compute_is_account_readonly',
+ help='Technical field',
+ )
+
+ is_income_account_readonly = fields.Boolean(
+ compute='_compute_is_account_readonly',
+ help='Technical field',
+ )
+
@api.onchange('categ_id', 'fiscal_classification_id')
def _onchange_categ_fiscal_classification_id(self):
res = super(
ProductTemplate, self)._onchange_categ_fiscal_classification_id()
if self.fiscal_classification_id:
- fiscal_account_values = self.get_fiscal_account(
- self.fiscal_classification_id
- )
- self.update(fiscal_account_values)
+ vals = {
+ 'property_account_income_id': False,
+ 'property_account_expense_id': False,
+ }
+ vals.update(self.get_fiscal_account(self.fiscal_classification_id))
+ self.update(vals)
return res
@api.model
- def get_fiscal_account(self, fiscal_classification_id=False):
- fiscal_account_values = {
- 'property_account_income_id': False,
- 'property_account_expense_id': False,
- }
- if fiscal_classification_id:
- if isinstance(fiscal_classification_id, int):
- fiscal_classification_id = \
- self.env['account.product.fiscal.classification'].browse(
- fiscal_classification_id
- )
- fiscal_account_values = {
- 'property_account_income_id':
- fiscal_classification_id.income_account_id.id,
- 'property_account_expense_id':
- fiscal_classification_id.expense_account_id.id,
- }
- return fiscal_account_values
+ def get_fiscal_account(self, fc=False):
+ vals = {}
+ if fc and isinstance(fc, int):
+ fc = self.env['account.product.fiscal.classification'].browse(fc)
+ if not fc:
+ return vals
+ if fc.income_account_id:
+ vals.update({
+ 'property_account_income_id': fc.income_account_id.id})
+ if fc.expense_account_id:
+ vals.update({
+ 'property_account_expense_id': fc.expense_account_id.id})
+ return vals
@api.model
def create(self, vals):
if 'fiscal_classification_id' in vals:
- fiscal_classification_id = vals.get('fiscal_classification_id', False)
- fiscal_account_values = self.get_fiscal_account(
- fiscal_classification_id)
- vals.update(fiscal_account_values)
- return super(ProductTemplate, self).create(vals=vals)
+ fiscal_classification_id = vals.get('fiscal_classification_id')
+ account_vals = self.get_fiscal_account(fiscal_classification_id)
+ vals.update(account_vals)
+ return super(ProductTemplate, self).create(vals)
@api.multi
def write(self, vals):
if 'fiscal_classification_id' in vals:
- fiscal_classification_id = vals.get('fiscal_classification_id',
- False)
- fiscal_account_values = self.get_fiscal_account(
- fiscal_classification_id)
- vals.update(fiscal_account_values)
- return super(ProductTemplate, self).write(vals=vals)
+ fiscal_classification_id = vals.get('fiscal_classification_id')
+ account_vals = self.get_fiscal_account(fiscal_classification_id)
+ vals.update(account_vals)
+ return super(ProductTemplate, self).write(vals)
@api.multi
def toggle_available_in_pos(self):
- for product_template in self:
- product_template.available_in_pos = not product_template.available_in_pos
+ for rec in self:
+ rec.available_in_pos = not rec.available_in_pos
+
+ @api.multi
+ @api.depends(
+ 'fiscal_classification_id.income_account_id',
+ 'fiscal_classification_id.expense_account_id',
+ )
+ def _compute_is_account_readonly(self):
+ for rec in self:
+ fc_id = rec.fiscal_classification_id
+ rec.is_income_account_readonly = \
+ fc_id and fc_id.income_account_id
+ rec.is_expense_account_readonly = \
+ fc_id and fc_id.expense_account_id
diff --git a/intercoop_addons/coop_purchase/views/product_template_view.xml b/intercoop_addons/coop_purchase/views/product_template_view.xml
index 0cac8e2a07..d0519168bb 100644
--- a/intercoop_addons/coop_purchase/views/product_template_view.xml
+++ b/intercoop_addons/coop_purchase/views/product_template_view.xml
@@ -5,11 +5,15 @@
product.template
+
+
- 1
+ {'readonly': [('is_income_account_readonly', '=', True)]}
- 1
+ {'readonly': [('is_expense_account_readonly', '=', True)]}
diff --git a/intercoop_addons/coop_shift/i18n/coop_shift.pot b/intercoop_addons/coop_shift/i18n/coop_shift.pot
index fe5b58ad02..3d642be53c 100644
--- a/intercoop_addons/coop_shift/i18n/coop_shift.pot
+++ b/intercoop_addons/coop_shift/i18n/coop_shift.pot
@@ -3462,7 +3462,7 @@ msgstr ""
#. module: coop_shift
#: model:ir.model.fields,field_description:coop_shift.field_res_partner_is_squadleader
msgid "is an active Squadleader"
-msgstr ""
+msgstr "Est un coordinateur"
#. module: coop_shift
#: model:ir.ui.view,arch_db:coop_shift.shift_report_timesheet_view
diff --git a/intercoop_addons/coop_shift/i18n/fr.po b/intercoop_addons/coop_shift/i18n/fr.po
index b16243c5ee..a96b871d1d 100644
--- a/intercoop_addons/coop_shift/i18n/fr.po
+++ b/intercoop_addons/coop_shift/i18n/fr.po
@@ -2335,7 +2335,7 @@ msgstr "Responsable d'équipe"
#: model:ir.model.fields,field_description:coop_shift.field_shift_template_user_ids
#: model:ir.model.fields,field_description:coop_shift.field_shift_ticket_user_ids
msgid "Shift Leaders"
-msgstr "Responsables d'équipes"
+msgstr "Coordinateurs"
#. module: coop_shift
#: model:ir.ui.view,arch_db:coop_shift.view_shift_mail_form
@@ -3335,7 +3335,7 @@ msgstr "L'intervalle ne peut être négatif."
#. module: coop_shift
#: model:ir.model.fields,field_description:coop_shift.field_res_partner_is_squadleader
msgid "is an active Squadleader"
-msgstr "Est responsable d'équipe"
+msgstr "Est un coordinateur"
#. module: coop_shift
#: model:ir.ui.view,arch_db:coop_shift.shift_report_timesheet_view
diff --git a/intercoop_addons/coop_shift/model/shift_template.py b/intercoop_addons/coop_shift/model/shift_template.py
index b8e4378987..c5543b4c7a 100644
--- a/intercoop_addons/coop_shift/model/shift_template.py
+++ b/intercoop_addons/coop_shift/model/shift_template.py
@@ -544,8 +544,23 @@ def write(self, vals):
for key in vals.keys()
)
if only_update_seats_max:
- vals['updated_fields'] = False
- return super(ShiftTemplate, self).write(vals)
+ vals['updated_fields'] = ''
+
+ res = super(ShiftTemplate, self).write(vals)
+ updated_fields = vals.get('updated_fields', '')
+ if updated_fields.startswith('{'):
+ update_wizard_env = self.env['update.shifts.wizard']
+ for shift_template in self:
+ wizard_obj = update_wizard_env.create({
+ 'template_id': shift_template.id,
+ 'updated_fields': updated_fields,
+ })
+ wizard_obj.write({
+ 'line_ids': wizard_obj._get_line_ids(shift_template)
+ })
+ wizard_obj.update_shifts()
+
+ return res
# Custom Public Section
@api.multi
diff --git a/intercoop_addons/coop_shift/security/ir.model.access.csv b/intercoop_addons/coop_shift/security/ir.model.access.csv
index d2c56cba9a..5be8206d3e 100755
--- a/intercoop_addons/coop_shift/security/ir.model.access.csv
+++ b/intercoop_addons/coop_shift/security/ir.model.access.csv
@@ -61,3 +61,5 @@ ir_model_access_event_mail_access,event.mail access,event.model_event_mail,coop_
ir_model_access_event_ticket_access,event.ticket access,event_sale.model_event_event_ticket,coop_shift.group_event_without_menu,1,1,1,1
,,,,,,,
ir_model_access_event_mail_registration,event.mail.registration access,event.model_event_mail_registration,coop_shift.group_event_without_menu,1,1,1,1
+,,,,,,,
+ir_model_access_shift_template_registration_membership_read,shift.template.registration membership read access,coop_shift.model_shift_template_registration,coop_membership.group_membership_bdm_lecture,1,0,0,0
\ No newline at end of file
diff --git a/intercoop_addons/coop_shift/views/shift_template_view.xml b/intercoop_addons/coop_shift/views/shift_template_view.xml
index ec2e155178..7b939ff229 100644
--- a/intercoop_addons/coop_shift/views/shift_template_view.xml
+++ b/intercoop_addons/coop_shift/views/shift_template_view.xml
@@ -109,7 +109,7 @@
-
+
diff --git a/intercoop_addons/coop_shift/wizard/update_shifts_wizard.py b/intercoop_addons/coop_shift/wizard/update_shifts_wizard.py
index 535e5ed385..d81f4ef80c 100644
--- a/intercoop_addons/coop_shift/wizard/update_shifts_wizard.py
+++ b/intercoop_addons/coop_shift/wizard/update_shifts_wizard.py
@@ -43,7 +43,7 @@ def _get_line_ids(self, template, date_from=None, date_to=None):
shift.state == "draft":
line_ids.append((0, 0, {
'wizard_id': self.id,
- 'shift_id': shift,
+ 'shift_id': shift.id,
'name': shift.name,
'user_ids': [(6, 0, shift.user_ids.ids)],
'shift_type_id': shift.shift_type_id.id,
@@ -61,6 +61,13 @@ def _default_line_ids(self):
return self._get_line_ids(
template, date_from=self.date_from, date_to=self.date_to)
+ @api.model
+ def _get_updated_fields(self):
+ template_id = self.env.context.get('active_id', False)
+ if template_id:
+ template = self.env['shift.template'].browse(template_id)
+ return template.updated_fields
+
@api.onchange('date_from', 'date_to')
def _onchange_dates(self):
template_id = self.env.context.get('active_id', False)
@@ -75,8 +82,9 @@ def _onchange_dates(self):
date_from = fields.Date('Update shifts from')
date_to = fields.Date('Update shifts until')
updated_fields = fields.Char(
- related='template_id.updated_fields',
- string="""Changes to repercute on selected shifts""")
+ default=_get_updated_fields,
+ string="""Changes to repercute on selected shifts"""
+ )
@api.multi
def update_lines(self, date_from=None, date_to=None):
@@ -101,7 +109,9 @@ def update_shifts(self):
del vals['shift_ticket_ids']
shift_obj.browse(shift_ids).with_context(
tracking_disable=True, special=special).write(vals)
- wizard.template_id.updated_fields = ""
+ wizard.template_id.write({
+ 'updated_fields': ''
+ })
return True
diff --git a/intercoop_addons/email_validation_check/data/email_template_data.xml b/intercoop_addons/email_validation_check/data/email_template_data.xml
index a4034e2350..6bdac5a349 100644
--- a/intercoop_addons/email_validation_check/data/email_template_data.xml
+++ b/intercoop_addons/email_validation_check/data/email_template_data.xml
@@ -6,7 +6,7 @@
${(object.company_id.email or '')|safe}
${object.email|safe}
${object.lang}
- no-reply@cooplalouve.fr
+ ${object.company_id.email and '@' in object.company_id.email and 'no-reply@%s' % object.company_id.email.split('@')[-1] or ''}
Confirm validated email
Dear ${object.name},
diff --git a/intercoop_addons/product_history/__openerp__.py b/intercoop_addons/product_history/__openerp__.py
index 258b0fcaf4..c415d9abe9 100755
--- a/intercoop_addons/product_history/__openerp__.py
+++ b/intercoop_addons/product_history/__openerp__.py
@@ -22,7 +22,7 @@
##############################################################################
{
'name': 'Product - History',
- 'version': '9.0.2',
+ 'version': '9.0.3',
'category': 'Product',
'description': """
Computes figures about the product's sales, purchases, stocks.
diff --git a/intercoop_addons/product_history/migrations/9.0.3/post-update-product-history.py b/intercoop_addons/product_history/migrations/9.0.3/post-update-product-history.py
new file mode 100644
index 0000000000..a20155f174
--- /dev/null
+++ b/intercoop_addons/product_history/migrations/9.0.3/post-update-product-history.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+
+from openerp.modules.registry import RegistryManager
+from openerp import SUPERUSER_ID
+
+
+def migrate(cr, installed_version):
+ registry = RegistryManager.get(cr.dbname)
+ history_obj = registry['product.history']
+ history_obj.product_history_update_background(cr, SUPERUSER_ID)
diff --git a/intercoop_addons/product_history/models/product_history.py b/intercoop_addons/product_history/models/product_history.py
index f02ae28a65..45df2b4fe5 100755
--- a/intercoop_addons/product_history/models/product_history.py
+++ b/intercoop_addons/product_history/models/product_history.py
@@ -22,6 +22,13 @@
##############################################################################
from openerp import models, fields, api
+from openerp import SUPERUSER_ID
+from openerp.addons.connector.session import ConnectorSession
+from openerp.addons.connector.queue.job import job, related_action
+from collections import defaultdict
+
+import logging
+logger = logging.getLogger('openerp.louve_change_translation')
HISTORY_RANGE = [
('days', 'Days'),
@@ -90,3 +97,92 @@ def create(self, vals):
vals.get('sale_qty', 0) == 0:
vals['ignored'] = True
return super(ProductHistory, self).create(vals)
+
+ @api.model
+ def get_products(self):
+ sql = """select distinct ph.product_id from product_history ph
+ left join product_product p on ph.product_id = p.id
+ where p.history_updated = 'f' or p.history_updated is null"""
+ self.env.cr.execute(sql)
+ return [p[0] for p in self.env.cr.fetchall()]
+
+ @api.model
+ def update_products_history(self, product_ids):
+ product_obj = self.env['product.product']
+ product_history_obj = self.env['product.history']
+ for product_id in product_ids:
+ logger.info('Updating Product ID: %s' % product_id)
+ try:
+ for history_range in ['days', 'weeks', 'months']:
+ history_lines = product_history_obj.search(
+ [('product_id', '=', product_id),
+ ('history_range', '=', history_range)],
+ order='from_date')
+ if history_lines:
+ sql = """
+ SELECT date_trunc(%s, sm.date)::date,
+ orig.usage usage,
+ CASE WHEN orig.usage = 'inventory'
+ THEN SUM(sm.product_qty)
+ ELSE -sum(sm.product_qty) END product_qty
+ FROM stock_move as sm, stock_location as orig,
+ stock_location as dest
+ WHERE sm.location_id = orig.id and
+ sm.location_dest_id = dest.id
+ and sm.product_id = %s and
+ sm.date >= %s and
+ sm.date <= %s and
+ (dest.usage = 'inventory' or
+ orig.usage = 'inventory') and
+ sm.state = 'done'
+ GROUP BY date_trunc(%s,sm.date), orig.usage
+ ORDER BY date_trunc(%s,sm.date)
+ """
+ params = (history_range[:-1], product_id,
+ history_lines[0].from_date,
+ history_lines[-1].to_date + ' 23:59:59',
+ history_range[:-1], history_range[:-1])
+ self.env.cr.execute(sql, params)
+ stock_moves = self.env.cr.fetchall()
+ stock_moves_dict = defaultdict(float)
+ for move in stock_moves:
+ # set sm.date as a key
+ stock_moves_dict[move[0]] += move[2]
+ opening_qty = history_lines[0].start_qty
+ for line in history_lines:
+ loss_qty = stock_moves_dict.get(line.from_date, 0)
+ end_qty = opening_qty + line.purchase_qty + \
+ line.sale_qty + loss_qty
+ line.write({'start_qty': opening_qty,
+ 'loss_qty': loss_qty,
+ 'end_qty': end_qty,
+ 'virtual_qty':
+ end_qty + line.incoming_qty +
+ line.outgoing_qty})
+ opening_qty = end_qty
+ product_obj.browse(product_id).write({'history_updated': True})
+
+ except Exception as e:
+ logger.error('Error while updating a product ID: %s, %s' % (
+ product_id, str(e)))
+ return True
+
+ @api.model
+ def product_history_update_background(self):
+ session = ConnectorSession(self._cr, SUPERUSER_ID)
+ product_ids = self.get_products()
+ num_prod_per_job = 50
+ splitted_prod_list = [product_ids[i: i + num_prod_per_job]
+ for i in range(0, len(product_ids),
+ num_prod_per_job)]
+ # Create jobs
+ for product_list in splitted_prod_list:
+ create_job_to_update_product_history.delay(
+ session, 'product.history', product_list, priority=1,
+ eta=10)
+
+
+@job
+def create_job_to_update_product_history(session, model_name, product_ids):
+ """ Job for Recomputing Loss Qty and Opening Qty of Product History """
+ session.env[model_name].update_products_history(product_ids)
diff --git a/intercoop_addons/product_history/models/product_product.py b/intercoop_addons/product_history/models/product_product.py
index d370eb9a95..dc2395f754 100755
--- a/intercoop_addons/product_history/models/product_product.py
+++ b/intercoop_addons/product_history/models/product_product.py
@@ -60,6 +60,7 @@ class ProductProduct(models.Model):
string='last day history record', comodel_name='product.history',)
last_history_month = fields.Many2one(
string='last day history record', comodel_name='product.history',)
+ history_updated = fields.Boolean('History Updated', default=False)
# Private section
@api.onchange(
diff --git a/intercoop_addons/purchase_compute_order/__openerp__.py b/intercoop_addons/purchase_compute_order/__openerp__.py
index 22279a2b81..fad3347c96 100755
--- a/intercoop_addons/purchase_compute_order/__openerp__.py
+++ b/intercoop_addons/purchase_compute_order/__openerp__.py
@@ -23,7 +23,7 @@
{
'name': 'Computed Purchase Order',
- 'version': '9.0.1',
+ 'version': '9.0.2',
'category': 'Purchase',
'description': """
Provide tools to help purchaser during purchase process
diff --git a/intercoop_addons/purchase_compute_order/i18n/fr.po b/intercoop_addons/purchase_compute_order/i18n/fr.po
old mode 100755
new mode 100644
index 48ad3b03da..fc9e05adb8
--- a/intercoop_addons/purchase_compute_order/i18n/fr.po
+++ b/intercoop_addons/purchase_compute_order/i18n/fr.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 9.0c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-14 13:26+0000\n"
-"PO-Revision-Date: 2016-12-14 13:26+0000\n"
+"POT-Creation-Date: 2019-11-26 20:33+0000\n"
+"PO-Revision-Date: 2019-11-26 20:33+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgid "Active"
msgstr "Actif"
#. module: purchase_compute_order
-#: code:addons/purchase_compute_order/model/computed_purchase_order.py:376
+#: code:addons/purchase_compute_order/model/computed_purchase_order.py:377
#, python-format
msgid "All purchase quantities are set to 0!"
msgstr "Toutes les quantités d'achat sont à 0!"
@@ -36,10 +36,16 @@ msgstr "Montant de la commande"
msgid "Apply"
msgstr "Appliquer"
+#. module: purchase_compute_order
+#: selection:computed.purchase.order,line_order:0
+#: selection:res.partner,cpo_line_order:0
+msgid "Ascending"
+msgstr "Ascendant"
+
#. module: purchase_compute_order
#: model:ir.model.fields,field_description:purchase_compute_order.field_computed_purchase_order_line_displayed_average_consumption
msgid "Average Consumption"
-msgstr "Conso moy."
+msgstr "Conso moy"
#. module: purchase_compute_order
#: model:ir.model.fields,field_description:purchase_compute_order.field_computed_purchase_order_line_average_consumption
@@ -51,6 +57,16 @@ msgstr "Consommation Moyenne"
msgid "By unchecking the active field, you may hide this item without deleting it."
msgstr "En décochant la case actif, vous pouvez cacher cet enregistrement sans le supprimer."
+#. module: purchase_compute_order
+#: model:ir.model.fields,field_description:purchase_compute_order.field_res_partner_cpo_line_order_field
+msgid "CPO Lines Order"
+msgstr "Ordre des lignes CPO"
+
+#. module: purchase_compute_order
+#: model:ir.model.fields,field_description:purchase_compute_order.field_res_partner_cpo_line_order
+msgid "CPO Lines Order Direction"
+msgstr "Ordre des lignes CPO (direction)"
+
#. module: purchase_compute_order
#: model:ir.ui.view,arch_db:purchase_compute_order.view_update_products_form
msgid "Cancel"
@@ -167,9 +183,10 @@ msgid "Default Unit of Measure used for all stock operation."
msgstr "Unité de mesure par défaut utilisée pour toutes les opérations de stock"
#. module: purchase_compute_order
-#: model:ir.model.fields,field_description:purchase_compute_order.field_product_product_default_seller_id
-msgid "Default seller id"
-msgstr "Default seller id"
+#: selection:computed.purchase.order,line_order:0
+#: selection:res.partner,cpo_line_order:0
+msgid "Descending"
+msgstr "Descendant"
#. module: purchase_compute_order
#: model:ir.model.fields,field_description:purchase_compute_order.field_computed_purchase_order_line_discount
@@ -217,6 +234,11 @@ msgstr "Récupérer articles et stocks"
msgid "Gives the sequence order when displaying a list of purchase order lines."
msgstr "Donne le numéro de séquance lors de l'affichage des lignes."
+#. module: purchase_compute_order
+#: model:ir.model.fields,help:purchase_compute_order.field_computed_purchase_order_line_product_sequence
+msgid "Gives the sequence order when displaying a product list"
+msgstr "Indique l'ordre d'affichage lorsqu'une liste d'articles est affichée."
+
#. module: purchase_compute_order
#: model:ir.model.fields,field_description:purchase_compute_order.field_computed_purchase_order_id
#: model:ir.model.fields,field_description:purchase_compute_order.field_computed_purchase_order_line_id
@@ -264,7 +286,7 @@ msgstr "Dernière modification le"
#: model:ir.model.fields,field_description:purchase_compute_order.field_update_products_line_wizard_write_uid
#: model:ir.model.fields,field_description:purchase_compute_order.field_update_products_wizard_write_uid
msgid "Last Updated by"
-msgstr "Mis à jour par"
+msgstr "Dernière mise à jour par"
#. module: purchase_compute_order
#: model:ir.model.fields,field_description:purchase_compute_order.field_computed_purchase_order_line_write_date
@@ -272,7 +294,17 @@ msgstr "Mis à jour par"
#: model:ir.model.fields,field_description:purchase_compute_order.field_update_products_line_wizard_write_date
#: model:ir.model.fields,field_description:purchase_compute_order.field_update_products_wizard_write_date
msgid "Last Updated on"
-msgstr "Mis à jour le"
+msgstr "Dernière mise à jour le"
+
+#. module: purchase_compute_order
+#: model:ir.model.fields,field_description:purchase_compute_order.field_computed_purchase_order_line_order_field
+msgid "Lines Order"
+msgstr "Lines Order"
+
+#. module: purchase_compute_order
+#: model:ir.model.fields,field_description:purchase_compute_order.field_computed_purchase_order_line_order
+msgid "Lines Order Direction"
+msgstr "Lines Order Direction"
#. module: purchase_compute_order
#: model:ir.ui.view,arch_db:purchase_compute_order.view_computed_purchase_order_form
@@ -297,7 +329,7 @@ msgstr "Durée minimum après commande"
#. module: purchase_compute_order
#: model:ir.model.fields,field_description:purchase_compute_order.field_computed_purchase_order_line_weight
msgid "Net Weight"
-msgstr "Poids net"
+msgstr "Poids Net"
#. module: purchase_compute_order
#: code:addons/purchase_compute_order/model/computed_purchase_order.py:36
@@ -385,6 +417,12 @@ msgstr "Article"
msgid "Product Information"
msgstr "Information de l'article"
+#. module: purchase_compute_order
+#: selection:computed.purchase.order,line_order_field:0
+#: selection:res.partner,cpo_line_order_field:0
+msgid "Product Sequence"
+msgstr "Séquence"
+
#. module: purchase_compute_order
#: sql_constraint:computed.purchase.order.line:0
msgid "Product must be unique by computed purchase order!"
@@ -397,7 +435,7 @@ msgid "Products to order."
msgstr "Produits à commander."
#. module: purchase_compute_order
-#: code:addons/purchase_compute_order/model/computed_purchase_order.py:398
+#: code:addons/purchase_compute_order/model/computed_purchase_order.py:399
#: model:ir.model.fields,field_description:purchase_compute_order.field_computed_purchase_order_purchase_order_id
#: model:ir.ui.view,arch_db:purchase_compute_order.view_cpo_config_settings
#, python-format
@@ -463,6 +501,7 @@ msgid "Search Purchase Order"
msgstr "Chercher un bon de commande"
#. module: purchase_compute_order
+#: model:ir.model.fields,field_description:purchase_compute_order.field_computed_purchase_order_line_product_sequence
#: model:ir.model.fields,field_description:purchase_compute_order.field_computed_purchase_order_line_sequence
msgid "Sequence"
msgstr "Séquence"
@@ -473,6 +512,12 @@ msgid "Shows if the product's information has been updated"
msgstr "Indique si les informations du produit ont été modifiées"
#. module: purchase_compute_order
+#: model:ir.ui.view,arch_db:purchase_compute_order.view_computed_purchase_order_form
+msgid "Sort lines"
+msgstr "Sort lines"
+
+#. module: purchase_compute_order
+#: model:ir.model.fields,field_description:purchase_compute_order.field_computed_purchase_order_line_cpo_state
#: model:ir.model.fields,field_description:purchase_compute_order.field_computed_purchase_order_line_state
#: model:ir.model.fields,field_description:purchase_compute_order.field_computed_purchase_order_state
msgid "State"
@@ -488,11 +533,6 @@ msgstr "Stock"
msgid "Stock Duration (Days)"
msgstr "Durée (j)"
-#. module: purchase_compute_order
-#: model:ir.ui.view,arch_db:purchase_compute_order.view_computed_purchase_order_form
-msgid "Stock details"
-msgstr "Détail des stocks"
-
#. module: purchase_compute_order
#: model:ir.model.fields,field_description:purchase_compute_order.field_computed_purchase_order_stock_line_ids
msgid "Stock line ids"
@@ -509,18 +549,22 @@ msgid "Supplier"
msgstr "Fournisseur"
#. module: purchase_compute_order
+#: selection:computed.purchase.order,line_order_field:0
#: model:ir.model.fields,field_description:purchase_compute_order.field_computed_purchase_order_line_product_code
#: model:ir.model.fields,field_description:purchase_compute_order.field_computed_purchase_order_line_product_code_inv
#: model:ir.model.fields,field_description:purchase_compute_order.field_update_products_line_wizard_product_code
+#: selection:res.partner,cpo_line_order_field:0
msgid "Supplier Product Code"
-msgstr "Code (fourn)"
+msgstr "Référence fournisseur"
#. module: purchase_compute_order
+#: selection:computed.purchase.order,line_order_field:0
#: model:ir.model.fields,field_description:purchase_compute_order.field_computed_purchase_order_line_product_name
#: model:ir.model.fields,field_description:purchase_compute_order.field_computed_purchase_order_line_product_name_inv
#: model:ir.model.fields,field_description:purchase_compute_order.field_update_products_line_wizard_product_name
+#: selection:res.partner,cpo_line_order_field:0
msgid "Supplier Product Name"
-msgstr "Nom (fourn)"
+msgstr "Nom de l'article chez le fournisseur"
#. module: purchase_compute_order
#: model:ir.model.fields,field_description:purchase_compute_order.field_computed_purchase_order_line_product_price
@@ -560,6 +604,12 @@ msgstr "Type d'objectif"
msgid "The available quantity on hand for this product"
msgstr "Le stock de produit disponible"
+#. module: purchase_compute_order
+#: model:ir.model.fields,help:purchase_compute_order.field_computed_purchase_order_line_order_field
+#: model:ir.model.fields,help:purchase_compute_order.field_res_partner_cpo_line_order_field
+msgid "The field used to sort the CPO lines"
+msgstr "The field used to sort the CPO lines"
+
#. module: purchase_compute_order
#: model:ir.model.fields,help:purchase_compute_order.field_update_products_line_wizard_package_qty
msgid "The minimal quantity to purchase to this supplier, expressed in the supplier Product Unit of Measure if not empty, in the default unit of measure of the product otherwise."
@@ -618,7 +668,7 @@ msgid "This price will be considered as a price for the supplier Unit of Measure
msgstr "Le prix du produit par UdM d'achat"
#. module: purchase_compute_order
-#: code:addons/purchase_compute_order/model/computed_purchase_order_line.py:329
+#: code:addons/purchase_compute_order/model/computed_purchase_order_line.py:340
#, python-format
msgid "This product is already in the list!"
msgstr "Ce produit est déjà dans la liste!"
@@ -645,6 +695,16 @@ msgstr "Cet outil vous permet de calculer vos besoins en se basant sur le stock
msgid "Total"
msgstr "Total"
+#. module: purchase_compute_order
+#: model:ir.model.fields,field_description:purchase_compute_order.field_computed_purchase_order_package_qty_count
+msgid "Total Quantity of Packages"
+msgstr "Nb. Colis"
+
+#. module: purchase_compute_order
+#: model:ir.model.fields,help:purchase_compute_order.field_computed_purchase_order_package_qty_count
+msgid "Total count of packages by the current vendor"
+msgstr "Total count of packages by the current vendor"
+
#. module: purchase_compute_order
#: model:ir.model.fields,help:purchase_compute_order.field_computed_purchase_order_name
msgid "Unique number of the automated purchase order, computed automatically when the computed purchase order is created."
diff --git a/intercoop_addons/purchase_compute_order/migrations/9.0.2/pre-migration.py b/intercoop_addons/purchase_compute_order/migrations/9.0.2/pre-migration.py
new file mode 100644
index 0000000000..c6ec5ac091
--- /dev/null
+++ b/intercoop_addons/purchase_compute_order/migrations/9.0.2/pre-migration.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from openerp import api, SUPERUSER_ID
+
+import logging
+_logger = logging.getLogger(__name__)
+
+
+def migrate(cr, version):
+ if not version:
+ return
+
+ with api.Environment.manage():
+ env = api.Environment(cr, SUPERUSER_ID, {})
+ louve_custom_cpo = env['ir.module.module'].search([
+ ('name', '=', 'louve_custom_cpo'),
+ ('state', 'in', ['installed', 'to upgrade', 'to install']),
+ ])
+
+ if louve_custom_cpo:
+ _logger.info('Uninstalling louve_custom_cpo..')
+ louve_custom_cpo.button_immediate_uninstall()
+
+ # Reordering cpo lines
+ _logger.info('Updating sequence of previous orders..')
+ cr.execute("""
+ UPDATE computed_purchase_order_line AS cpol
+ SET sequence = ol.rownum
+ FROM (
+ SELECT
+ id,
+ ROW_NUMBER() OVER (
+ PARTITION BY computed_purchase_order_id
+ ORDER BY product_code asc
+ ) AS rownum
+ FROM computed_purchase_order_line
+ ) AS ol
+ WHERE cpol.id = ol.id
+ """)
diff --git a/intercoop_addons/purchase_compute_order/model/computed_purchase_order.py b/intercoop_addons/purchase_compute_order/model/computed_purchase_order.py
index 99a550227d..9dd5287042 100755
--- a/intercoop_addons/purchase_compute_order/model/computed_purchase_order.py
+++ b/intercoop_addons/purchase_compute_order/model/computed_purchase_order.py
@@ -92,7 +92,7 @@ class ComputedPurchaseOrder(models.Model):
purchase_target = fields.Integer('Purchase Target', default=0)
target_type = fields.Selection(
_TARGET_TYPE, 'Target Type', required=True,
- default='product_price_inv_eq',
+ default='time',
help="""This defines the amount of products you want to"""
""" purchase. \n"""
"""The system will compute a purchase order based on the stock"""
@@ -104,6 +104,26 @@ class ComputedPurchaseOrder(models.Model):
""" average consumption)\n"""
""" * Target type 'kg': computed purchase order will weight at"""
""" least the weight specified""")
+ line_order_field = fields.Selection(
+ [
+ ('product_code', 'Supplier Product Code'),
+ ('product_name', 'Supplier Product Name'),
+ ('product_sequence', 'Product Sequence'),
+ ],
+ string='Lines Order',
+ help='The field used to sort the CPO lines',
+ default='product_code',
+ required=True,
+ )
+ line_order = fields.Selection(
+ [
+ ('asc', 'Ascending'),
+ ('desc', 'Descending'),
+ ],
+ string='Lines Order Direction',
+ default='asc',
+ required=True,
+ )
valid_psi = fields.Selection(
_VALID_PSI, 'Supplier choice', required=True,
default='first',
@@ -113,6 +133,12 @@ class ComputedPurchaseOrder(models.Model):
digits_compute=dp.get_precision('Product Price'),
string='Amount of the computed order',
multi='computed_amount_duration')
+ package_qty_count = fields.Float(
+ string='Total Quantity of Packages',
+ help='Total count of packages by the current vendor',
+ compute='_compute_package_quantity_count',
+ readonly='True',
+ )
computed_duration = fields.Integer(
compute='_get_computed_amount_duration',
string='Minimum duration after order',
@@ -161,6 +187,8 @@ def onchange_partner_id(self):
if self.partner_id:
self.purchase_target = self.partner_id.purchase_target
self.target_type = self.partner_id.target_type
+ self.line_order_field = self.partner_id.cpo_line_order_field
+ self.line_order = self.partner_id.cpo_line_order
self.line_ids = map(lambda x: (2, x.id, False), self.line_ids)
# Overload Section
@@ -174,57 +202,23 @@ def create(self, vals):
@api.multi
def write(self, vals):
- cpo_id = super(ComputedPurchaseOrder, self).write(vals)
- if self.update_sorting(vals):
- self._sort_lines()
- return cpo_id
+ res = super(ComputedPurchaseOrder, self).write(vals)
+ if 'line_ids' in vals:
+ self.sort_lines()
+ return res
@api.multi
- def update_sorting(self, vals):
- for cpo in self:
- try:
- line_ids = vals.get('line_ids', False)
- if not line_ids:
- return False
- # this context check will allow you to change the field list
- # without overriding the whole function
- need_sorting_fields = self.env.context.get(
- 'need_sorting_fields', False)
- if not need_sorting_fields:
- need_sorting_fields = [
- 'average_consumption',
- 'computed_qty',
- 'stock_duration',
- 'manual_input_output_qty',
- ]
- for value in line_ids:
- if len(value) > 2 and value[2] and isinstance(
- value[2], dict) and (set(
- need_sorting_fields) & set(value[2].keys())):
- return True
- return False
- except:
- return False
+ def sort_lines(self):
+ for rec in self:
+ # sort based on field
+ lines = rec.line_ids.sorted(
+ key=lambda l: getattr(l, rec.line_order_field),
+ reverse=(rec.line_order == 'desc'))
+ # store new sequence
+ for i, line in enumerate(lines):
+ line.sequence = i
# Private Section
- @api.multi
- def _sort_lines(self):
- cpol_obj = self.env['computed.purchase.order.line']
- for cpo in self:
- lines = cpol_obj.browse([x.id for x in cpo.line_ids]).read(
- ['stock_duration', 'average_consumption'])
- lines = sorted(
- lines, key=lambda line: line['average_consumption'],
- reverse=True)
- lines = sorted(lines, key=lambda line: line['stock_duration'])
-
- id_index_list = {}
- for i in lines:
- id_index_list[i['id']] = lines.index(i)
- for line_id in id_index_list.keys():
- cpol_obj.browse(line_id).write(
- {'sequence': id_index_list[line_id]})
-
@api.model
def _make_po_lines(self):
all_lines = []
@@ -275,6 +269,13 @@ def _compute_purchase_quantities_days(self):
line.purchase_qty = quantity
line.purchase_qty_package = quantity / line.package_qty
+ @api.multi
+ @api.depends('line_ids.purchase_qty_package')
+ def _compute_package_quantity_count(self):
+ for rec in self:
+ rec.package_qty_count = sum(rec.mapped(
+ 'line_ids.purchase_qty_package'))
+
@api.multi
def _compute_purchase_quantities_other(self, field):
for cpo in self:
diff --git a/intercoop_addons/purchase_compute_order/model/computed_purchase_order_line.py b/intercoop_addons/purchase_compute_order/model/computed_purchase_order_line.py
index b8c255e565..2b2fccf6ab 100755
--- a/intercoop_addons/purchase_compute_order/model/computed_purchase_order_line.py
+++ b/intercoop_addons/purchase_compute_order/model/computed_purchase_order_line.py
@@ -53,6 +53,7 @@ class ComputedPurchaseOrderLine(models.Model):
domain=[('purchase_ok', '=', True)])
uom_id = fields.Many2one(
related='product_id.uom_id', string="UoM", readonly='True')
+ product_sequence = fields.Integer(related='product_id.sequence')
product_code = fields.Char('Supplier Product Code',)
product_code_inv = fields.Char(
compute='_get_product_information', inverse='_set_product_code',
diff --git a/intercoop_addons/purchase_compute_order/model/res_partner.py b/intercoop_addons/purchase_compute_order/model/res_partner.py
index 89c4ea98d6..b32b1b0245 100755
--- a/intercoop_addons/purchase_compute_order/model/res_partner.py
+++ b/intercoop_addons/purchase_compute_order/model/res_partner.py
@@ -50,3 +50,25 @@ class ResPartner(models.Model):
""" average consumption)\n"""
"""* Target type 'kg': computed purchase order will weight"""
""" at least the weight specified""")
+
+ cpo_line_order_field = fields.Selection(
+ [
+ ('product_code', 'Supplier Product Code'),
+ ('product_name', 'Supplier Product Name'),
+ ('product_sequence', 'Product Sequence'),
+ ],
+ string='CPO Lines Order',
+ help='The field used to sort the CPO lines',
+ default='product_code',
+ required=True,
+ )
+
+ cpo_line_order = fields.Selection(
+ [
+ ('asc', 'Ascending'),
+ ('desc', 'Descending'),
+ ],
+ string='CPO Lines Order Direction',
+ default='asc',
+ required=True,
+ )
diff --git a/intercoop_addons/purchase_compute_order/views/view.xml b/intercoop_addons/purchase_compute_order/views/view.xml
index a253895738..3f58729e15 100755
--- a/intercoop_addons/purchase_compute_order/views/view.xml
+++ b/intercoop_addons/purchase_compute_order/views/view.xml
@@ -42,6 +42,8 @@
-
+
+
+
+
-
+
res.partner.form.cpo
res.partner
-
-
-
-
+
+
+
diff --git a/louve_addons/l10n_fr_fec_group_sale_purchase/__init__.py b/louve_addons/l10n_fr_fec_group_sale_purchase/__init__.py
new file mode 100644
index 0000000000..40272379f7
--- /dev/null
+++ b/louve_addons/l10n_fr_fec_group_sale_purchase/__init__.py
@@ -0,0 +1 @@
+from . import wizard
diff --git a/louve_addons/l10n_fr_fec_group_sale_purchase/__openerp__.py b/louve_addons/l10n_fr_fec_group_sale_purchase/__openerp__.py
new file mode 100644
index 0000000000..cda4d8adaf
--- /dev/null
+++ b/louve_addons/l10n_fr_fec_group_sale_purchase/__openerp__.py
@@ -0,0 +1,16 @@
+# -*- encoding: utf-8 -*-
+{
+ 'name': 'France - FEC Group Sale Purchase',
+ 'version': '9.0.1.0.0',
+ 'category': 'Localization',
+ 'summary': "Fichier d'Échange Informatisé (FEC) for France",
+ 'author': "Druidoo",
+ 'website': 'www.druidoo.fr',
+ 'depends': [
+ 'l10n_fr_fec',
+ ],
+ 'data': [
+ 'wizard/fec_view.xml',
+ ],
+ 'installable': True,
+}
diff --git a/louve_addons/l10n_fr_fec_group_sale_purchase/wizard/__init__.py b/louve_addons/l10n_fr_fec_group_sale_purchase/wizard/__init__.py
new file mode 100644
index 0000000000..1f42c12044
--- /dev/null
+++ b/louve_addons/l10n_fr_fec_group_sale_purchase/wizard/__init__.py
@@ -0,0 +1 @@
+from . import fec
diff --git a/louve_addons/l10n_fr_fec_group_sale_purchase/wizard/fec.py b/louve_addons/l10n_fr_fec_group_sale_purchase/wizard/fec.py
new file mode 100644
index 0000000000..e34a1dca3d
--- /dev/null
+++ b/louve_addons/l10n_fr_fec_group_sale_purchase/wizard/fec.py
@@ -0,0 +1,198 @@
+# -*- encoding: utf-8 -*-
+from openerp import models, fields, api
+import csv
+import os
+
+
+class AccountFrFec(models.TransientModel):
+ _inherit = 'account.fr.fec'
+
+ group_sale_purchase = fields.Boolean('Group Sale and Purchase Journals',
+ default=True)
+
+ @api.multi
+ def write_fec_lines(self, file_path, delimiter, date_from, date_to):
+ self.ensure_one()
+ if not self.group_sale_purchase:
+ return super(AccountFrFec, self).write_fec_lines(
+ file_path, delimiter, date_from, date_to)
+ if not os.path.exists(file_path):
+ raise ValueError('File {} not found'.format(file_path))
+
+ fec_file = open(file_path, 'a+')
+ w = csv.writer(fec_file, delimiter=delimiter)
+ sql_query = '''
+ (SELECT
+ replace(aj.code, '|', '/') AS JournalCode,
+ replace(aj.name, '|', '/') AS JournalLib,
+ replace(am.name, '|', '/') AS EcritureNum,
+ TO_CHAR(am.date, 'YYYYMMDD') AS EcritureDate,
+ aa.code AS CompteNum,
+ replace(aa.name, '|', '/') AS CompteLib,
+ CASE WHEN rp.ref IS null OR rp.ref = ''
+ THEN COALESCE('ID ' || rp.id, '')
+ ELSE rp.ref
+ END
+ AS CompAuxNum,
+ COALESCE(replace(rp.name, '|', '/'), '') AS CompAuxLib,
+ CASE WHEN am.ref IS null OR am.ref = ''
+ THEN '-'
+ ELSE replace(am.ref, '|', '/')
+ END
+ AS PieceRef,
+ TO_CHAR(am.date, 'YYYYMMDD') AS PieceDate,
+ CASE WHEN aml.name IS NULL THEN '/'
+ WHEN aml.name SIMILAR TO '[\t|\s|\n]*' THEN '/'
+ ELSE replace(aml.name, '|', '/') END AS EcritureLib,
+ replace(CASE WHEN aml.debit = 0 THEN '0,00' ELSE
+ to_char(aml.debit, '000000000000000D99') END, '.', ',')
+ AS Debit,
+ replace(CASE WHEN aml.credit = 0 THEN '0,00' ELSE
+ to_char(aml.credit, '000000000000000D99') END, '.', ',')
+ AS Credit,
+ CASE WHEN rec.name IS NULL THEN '' ELSE rec.name
+ END AS EcritureLet,
+ CASE WHEN aml.full_reconcile_id IS NULL THEN '' ELSE
+ TO_CHAR(rec.create_date, 'YYYYMMDD') END AS DateLet,
+ TO_CHAR(am.date, 'YYYYMMDD') AS ValidDate,
+ CASE
+ WHEN aml.amount_currency IS NULL OR
+ aml.amount_currency = 0 THEN ''
+ ELSE replace(to_char(aml.amount_currency,
+ '000000000000000D99'), '.', ',')
+ END AS Montantdevise,
+ CASE WHEN aml.currency_id IS NULL THEN '' ELSE rc.name END
+ AS Idevise,
+ TO_CHAR(aml.account_id, '0'),
+ TO_CHAR(aml.partner_id, '0')
+ FROM
+ account_move_line aml
+ LEFT JOIN account_move am ON am.id=aml.move_id
+ LEFT JOIN res_partner rp ON rp.id=aml.partner_id
+ JOIN account_journal aj ON aj.id = am.journal_id
+ JOIN account_account aa ON aa.id = aml.account_id
+ LEFT JOIN res_currency rc ON rc.id = aml.currency_id
+ LEFT JOIN account_full_reconcile rec ON
+ rec.id = aml.full_reconcile_id
+ WHERE
+ am.date >= %s
+ AND aj.type not in ('sale', 'purchase')
+ AND am.date <= %s
+ AND am.company_id = %s
+ AND (aml.debit != 0 OR aml.credit != 0)
+ '''
+
+ # For official report: only use posted entries
+ if self.export_type == "official":
+ sql_query += '''
+ AND am.state = 'posted'
+ '''
+
+ sql_query += '''
+ ORDER BY
+ am.date,
+ am.name,
+ aml.id)
+ '''
+
+ sql_query2 = '''
+ SELECT
+ replace(STRING_AGG(distinct aj.code, ';'), '|', '/') AS
+ JournalCode,
+ replace(STRING_AGG(distinct aj.name, ';'), '|', '/')
+ AS JournalLib,
+ replace(am.name, '|', '/') AS EcritureNum,
+ TO_CHAR(MAX(am.date), 'YYYYMMDD') AS
+ EcritureDate,
+ STRING_AGG(distinct aa.code, ';') AS CompteNum,
+ replace(STRING_AGG(distinct aa.name, ';'), '|', '/')
+ AS CompteLib,
+ CASE WHEN MIN(rp.ref) IS null OR MIN(rp.ref) = ''
+ THEN COALESCE('ID ' || min(rp.id), '')
+ ELSE MIN(rp.ref)
+ END
+ AS CompAuxNum,
+ COALESCE(replace(MAX(rp.name), '|', '/'), '') AS
+ CompAuxLib,
+ CASE WHEN MIN(am.ref) IS null OR MIN(am.ref) = ''
+ THEN '-'
+ ELSE replace(MIN(am.ref), '|', '/')
+ END
+ AS PieceRef,
+ TO_CHAR(MAX(am.date), 'YYYYMMDD') AS PieceDate,
+ CASE WHEN MIN(aml.name) IS NULL THEN '/'
+ WHEN MIN(aml.name) SIMILAR TO '[\t|\s|\n]*' THEN '/'
+ ELSE replace(MAX(aml.name), '|', '/') END AS
+ EcritureLib,
+ replace(CASE WHEN sum(aml.debit) = 0 THEN '0,00' ELSE
+ to_char(sum(aml.debit), '000000000000000D99') END, '.', ',
+ ') AS Debit,
+ replace(CASE WHEN sum(aml.credit) = 0 THEN '0,00' ELSE
+ to_char(sum(aml.credit), '000000000000000D99') END, '.', ',
+ ') AS Credit,
+ CASE WHEN MIN(rec.name) IS NULL THEN '' ELSE MIN(rec.name)
+ END AS EcritureLet,
+ CASE WHEN MIN(aml.full_reconcile_id) IS NULL THEN '' ELSE
+ TO_CHAR(MIN(rec.create_date), 'YYYYMMDD') END AS DateLet,
+ TO_CHAR(MIN(am.date), 'YYYYMMDD') AS ValidDate,
+ CASE
+ WHEN MIN(aml.amount_currency) IS NULL OR
+ MIN(aml.amount_currency) = 0 THEN ''
+ ELSE replace(to_char(MIN(aml.amount_currency),
+ '000000000000000D99'), '.', ',')
+ END AS Montantdevise,
+ CASE WHEN MIN(aml.currency_id) IS NULL THEN '' ELSE
+ MIN(rc.name) END AS Idevise,
+ TO_CHAR(aml.account_id, '0'),
+ TO_CHAR(aml.partner_id, '0')
+ FROM
+ account_move_line aml
+ LEFT JOIN account_move am ON am.id=aml.move_id
+ LEFT JOIN res_partner rp ON rp.id=aml.partner_id
+ JOIN account_journal aj ON aj.id = am.journal_id
+ JOIN account_account aa ON aa.id = aml.account_id
+ LEFT JOIN res_currency rc ON rc.id = aml.currency_id
+ LEFT JOIN account_full_reconcile rec ON
+ rec.id = aml.full_reconcile_id
+ WHERE
+ am.date >= %s
+ AND aj.type in ('sale', 'purchase')
+ AND am.date <= %s
+ AND am.company_id = %s
+ AND (aml.debit != 0 OR aml.credit != 0)
+ '''
+
+ # For official report: only use posted entries
+ if self.export_type == "official":
+ sql_query2 += '''
+ AND am.state = 'posted'
+ '''
+
+ sql_query2 += '''
+ GROUP BY
+ am.name,
+ aml.account_id,
+ aml.partner_id
+ '''
+ sql_query2 += '''
+ ORDER BY
+ MIN(am.date),
+ MIN(am.name),
+ MIN(aml.id)
+ '''
+
+ sql_query = sql_query + '''
+ UNION (
+ ''' + sql_query2 + ''' )
+ ORDER BY
+ PieceDate,
+ EcritureNum
+ '''
+
+ company = self.env.user.company_id
+ for row in self.minimize_execute(
+ sql_query, (date_from, date_to, company.id, date_from,
+ date_to, company.id)):
+ listrow = list(row)
+ w.writerow([s.encode("utf-8") if s else '' for s in listrow])
+ fec_file.close()
diff --git a/louve_addons/l10n_fr_fec_group_sale_purchase/wizard/fec_view.xml b/louve_addons/l10n_fr_fec_group_sale_purchase/wizard/fec_view.xml
new file mode 100644
index 0000000000..68a42b0cae
--- /dev/null
+++ b/louve_addons/l10n_fr_fec_group_sale_purchase/wizard/fec_view.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+ account.fr.fec.form.view
+ account.fr.fec
+
+
+
+
+
+
+
+
diff --git a/louve_addons/louve_custom_cpo/__openerp__.py b/louve_addons/louve_custom_cpo/__openerp__.py
deleted file mode 100755
index 4ac82e81a6..0000000000
--- a/louve_addons/louve_custom_cpo/__openerp__.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# Purchase - Computed Purchase Order Module for Odoo
-# Copyright (C) 2013-Today GRAP (http://www.grap.coop)
-# @author Julien WESTE
-# @author Sylvain LE GAL (https://twitter.com/legalsylvain)
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# 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
-
-
-
- computed.purchase.order.form.louve
- computed.purchase.order
-
-
-
-
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
-
-
-
\ No newline at end of file
-
+
+
-
-
-
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+ + + +TOTALS -------------------------------- --------
+ Recycler
+
+
+ Stacker
+
+
+
+
+ --------
+
+
+ +
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+ + + +
+
+
+
+
+
+
+
diff --git a/extra_addons/pos_automatic_cashdrawer/static/src/xml/templates.xml b/extra_addons/pos_automatic_cashdrawer/static/src/xml/templates.xml
deleted file mode 100644
index 2ee76f3abb..0000000000
--- a/extra_addons/pos_automatic_cashdrawer/static/src/xml/templates.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/extra_addons/pos_automatic_cashdrawer/account_journal_view.xml b/extra_addons/pos_automatic_cashdrawer/views/account_journal.xml
similarity index 90%
rename from extra_addons/pos_automatic_cashdrawer/account_journal_view.xml
rename to extra_addons/pos_automatic_cashdrawer/views/account_journal.xml
index f83fd2c708..7f2821a066 100644
--- a/extra_addons/pos_automatic_cashdrawer/account_journal_view.xml
+++ b/extra_addons/pos_automatic_cashdrawer/views/account_journal.xml
@@ -2,7 +2,7 @@
-
+
account.journal.automatic.cashdrawer.form
account.journal
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/extra_addons/pos_automatic_cashdrawer/pos_automatic_cashdrawer_view.xml b/extra_addons/pos_automatic_cashdrawer/views/pos_config.xml
similarity index 56%
rename from extra_addons/pos_automatic_cashdrawer/pos_automatic_cashdrawer_view.xml
rename to extra_addons/pos_automatic_cashdrawer/views/pos_config.xml
index dfdca13354..0e63be4a7f 100644
--- a/extra_addons/pos_automatic_cashdrawer/pos_automatic_cashdrawer_view.xml
+++ b/extra_addons/pos_automatic_cashdrawer/views/pos_config.xml
@@ -9,14 +9,8 @@
diff --git a/extra_addons/pos_barcode_rule_force/README.rst b/extra_addons/pos_barcode_rule_force/README.rst
new file mode 100644
index 0000000000..5ac8ecf0b9
--- /dev/null
+++ b/extra_addons/pos_barcode_rule_force/README.rst
@@ -0,0 +1,55 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+ :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+ :alt: License: AGPL-3
+
+==================================
+Point of Sale - Barcode Rule Force
+==================================
+
+This module adds a new field on the product: Force Barcode Rule
+
+If set, when this product is scanned on the POS, it will try to use that
+barcode rule instead of the one that matched the pattern first.
+
+This rule has to still match the pattern, and it should belong to the
+same nomenclature that's being used on the POS.
+
+
+Configuration
+=============
+
+* Go to any product
+* Edit Force Barcode Rule
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+`_. In case of trouble, please
+check there if your issue has already been reported. If you spotted it first,
+help us smash it by providing detailed and welcomed feedback.
+
+Credits
+=======
+
+
+Contributors
+------------
+
+* Iván Todorovich
+
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+ :alt: Odoo Community Association
+ :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+To contribute to this module, please visit https://odoo-community.org.
diff --git a/extra_addons/pos_barcode_rule_force/__init__.py b/extra_addons/pos_barcode_rule_force/__init__.py
new file mode 100644
index 0000000000..89d26e2f59
--- /dev/null
+++ b/extra_addons/pos_barcode_rule_force/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+import models
diff --git a/extra_addons/pos_barcode_rule_force/__openerp__.py b/extra_addons/pos_barcode_rule_force/__openerp__.py
new file mode 100644
index 0000000000..2132ec03f7
--- /dev/null
+++ b/extra_addons/pos_barcode_rule_force/__openerp__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2019-Today: Druidoo ()
+# @author: Iván Todorovich
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+{
+ 'name': 'Point of Sale - Barcode Rule Force',
+ 'version': '9.0.1.0.0',
+ 'category': 'Point Of Sale',
+ 'summary': 'On the product template, allow to force a specific rule',
+ 'author': 'Druidoo, Odoo Community Association (OCA)',
+ 'website': 'https://www.druidoo.io/',
+ 'license': 'AGPL-3',
+ 'depends': [
+ 'point_of_sale',
+ 'pos_barcode_rule_transform', # because of the hooks
+ ],
+ 'data': [
+ 'views/assets.xml',
+ 'views/product_template.xml',
+ ],
+ 'installable': True,
+}
diff --git a/extra_addons/pos_barcode_rule_force/models/__init__.py b/extra_addons/pos_barcode_rule_force/models/__init__.py
new file mode 100644
index 0000000000..37deeb7611
--- /dev/null
+++ b/extra_addons/pos_barcode_rule_force/models/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+import product_template
diff --git a/extra_addons/pos_barcode_rule_force/models/product_template.py b/extra_addons/pos_barcode_rule_force/models/product_template.py
new file mode 100644
index 0000000000..798952439c
--- /dev/null
+++ b/extra_addons/pos_barcode_rule_force/models/product_template.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2019-Today: Druidoo ()
+# @author: Iván Todorovich
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from openerp import api, models, fields
+
+
+class ProductTemplate(models.Model):
+ _inherit = 'product.template'
+
+ force_barcode_rule_id = fields.Many2one(
+ 'barcode.rule',
+ string='Force Barcode Rule',
+ help=(
+ 'If set, it will try to use this rule on the POS, '
+ 'regardless of the rule priority.'
+ )
+ )
diff --git a/extra_addons/pos_barcode_rule_force/static/src/js/models.js b/extra_addons/pos_barcode_rule_force/static/src/js/models.js
new file mode 100644
index 0000000000..66a40d2981
--- /dev/null
+++ b/extra_addons/pos_barcode_rule_force/static/src/js/models.js
@@ -0,0 +1,38 @@
+///*
+// Copyright (C) 2019-Today: Druidoo (https://www.druidoo.io)
+// @author: Iván Todorovich
+// License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+//*/
+
+odoo.define('pos_barcode_rule_force.models', function (require) {
+ "use strict";
+
+ // we require pos_barcode_rule_transform.BarcodeParser
+ // instead of barcodes.BarcodeParser because of the hooks
+ var BarcodeParser = require('pos_barcode_rule_transform.BarcodeParser');
+ var models = require('point_of_sale.models');
+
+ // Load field on pos init
+ models.load_fields('product.product', ['force_barcode_rule_id']);
+
+ var _super_PosModel = models.PosModel.prototype;
+ models.PosModel = models.PosModel.extend({
+ scan_product: function (parsed_code) {
+ var product = this.db.get_product_by_barcode(parsed_code.base_code);
+ if (product && product.force_barcode_rule_id) {
+ var rule_ids = this.barcode_reader.barcode_parser.nomenclature.rule_ids;
+ var rules = this.barcode_reader.barcode_parser.nomenclature.rules;
+ var i = rule_ids.indexOf(product.force_barcode_rule_id[0]);
+ if (i === -1) {
+ return console.error('Unable to force barcode rule, rule', product.force_barcode_rule_id, 'is not present in the BarcodeParser.')
+ }
+ var rule = rules[i];
+ parsed_code = this.barcode_reader.barcode_parser.try_rule(parsed_code, parsed_code.code, rule);
+ return _super_PosModel.scan_product.apply(this, [parsed_code]);
+ }
+ // normal behaviour
+ return _super_PosModel.scan_product.apply(this, arguments);
+ },
+ });
+
+});
diff --git a/extra_addons/pos_barcode_rule_force/views/assets.xml b/extra_addons/pos_barcode_rule_force/views/assets.xml
new file mode 100644
index 0000000000..a25db1573a
--- /dev/null
+++ b/extra_addons/pos_barcode_rule_force/views/assets.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/extra_addons/pos_barcode_rule_force/views/product_template.xml b/extra_addons/pos_barcode_rule_force/views/product_template.xml
new file mode 100644
index 0000000000..f3cb636631
--- /dev/null
+++ b/extra_addons/pos_barcode_rule_force/views/product_template.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+ product.template
+ 999
+
+
+
+
+
+
+
+ product.product
+ 999
+
+
+
+
+
+
+
diff --git a/extra_addons/pos_barcode_rule_transform/README.rst b/extra_addons/pos_barcode_rule_transform/README.rst
new file mode 100644
index 0000000000..e3100dffb5
--- /dev/null
+++ b/extra_addons/pos_barcode_rule_transform/README.rst
@@ -0,0 +1,57 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+ :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+ :alt: License: AGPL-3
+
+======================================
+Point of Sale - Barcode Rule Transform
+======================================
+
+This module extends Odoo Point Of Sale features, to allow to configure
+a python expression to transform the captured value in the barcode.
+
+This is usefull in the case you have a barcode with price information in it,
+but you need to add a margin, for instance.
+
+This happens when the supplier is the one printing the label, and you don't
+have control over the barcode.
+
+
+Configuration
+=============
+
+* Go to 'Point of Sale' / 'Configuration' / 'Barcode Nomenclatures'
+* Edit your barcode rules, according to your barcodes settings
+* Add a transform expression to the rule
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+`_. In case of trouble, please
+check there if your issue has already been reported. If you spotted it first,
+help us smash it by providing detailed and welcomed feedback.
+
+Credits
+=======
+
+
+Contributors
+------------
+
+* Iván Todorovich
+
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+ :alt: Odoo Community Association
+ :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+To contribute to this module, please visit https://odoo-community.org.
diff --git a/extra_addons/pos_barcode_rule_transform/__init__.py b/extra_addons/pos_barcode_rule_transform/__init__.py
new file mode 100644
index 0000000000..89d26e2f59
--- /dev/null
+++ b/extra_addons/pos_barcode_rule_transform/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+import models
diff --git a/extra_addons/pos_barcode_rule_transform/__openerp__.py b/extra_addons/pos_barcode_rule_transform/__openerp__.py
new file mode 100644
index 0000000000..f7f4f7b56c
--- /dev/null
+++ b/extra_addons/pos_barcode_rule_transform/__openerp__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2019-Today: Druidoo ()
+# @author: Iván Todorovich
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+{
+ 'name': 'Point of Sale - Barcode Rule Transform',
+ 'version': '9.0.1.0.0',
+ 'category': 'Point Of Sale',
+ 'summary': 'Transforms the value read in the barcode with a JS expression',
+ 'author': 'Druidoo, Odoo Community Association (OCA)',
+ 'website': 'https://www.druidoo.io/',
+ 'license': 'AGPL-3',
+ 'depends': [
+ 'point_of_sale',
+ ],
+ 'data': [
+ 'views/assets.xml',
+ 'views/barcode_rule.xml',
+ ],
+ 'demo': [
+ 'demo/demo.xml',
+ ],
+ 'installable': True,
+}
diff --git a/extra_addons/pos_barcode_rule_transform/demo/demo.xml b/extra_addons/pos_barcode_rule_transform/demo/demo.xml
new file mode 100644
index 0000000000..fcb2fc4d0a
--- /dev/null
+++ b/extra_addons/pos_barcode_rule_transform/demo/demo.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+ Product with Price Transform Barcode
+ 2212345044547
+
+
+
+ Price Transform Barcodes
+ price
+ 22.....{NNNDD}
+ 15
+ ean13
+ value * 0.15
+
+
+
diff --git a/extra_addons/pos_barcode_rule_transform/models/__init__.py b/extra_addons/pos_barcode_rule_transform/models/__init__.py
new file mode 100644
index 0000000000..1db856d953
--- /dev/null
+++ b/extra_addons/pos_barcode_rule_transform/models/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+import barcode_rule
diff --git a/extra_addons/pos_barcode_rule_transform/models/barcode_rule.py b/extra_addons/pos_barcode_rule_transform/models/barcode_rule.py
new file mode 100644
index 0000000000..0ba915c815
--- /dev/null
+++ b/extra_addons/pos_barcode_rule_transform/models/barcode_rule.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2019-Today: Druidoo ()
+# @author: Iván Todorovich
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from openerp import api, models, fields
+
+
+class BarcodeRule(models.Model):
+ _inherit = 'barcode.rule'
+
+ transform_expr = fields.Char(
+ 'Transform Expression',
+ help=(
+ 'Python Expression used to transform the value '
+ 'read in the barcode.\n'
+ 'ie: value / 0.15\n\n'
+ 'Available variables:\n'
+ '- value: the original value read in the barcode.\n'
+ '- code: the simplified barcode code\n'
+ '- barcode: the complete barcode.\n'
+ ),
+ )
diff --git a/extra_addons/pos_barcode_rule_transform/static/src/js/barcode.js b/extra_addons/pos_barcode_rule_transform/static/src/js/barcode.js
new file mode 100644
index 0000000000..965923c311
--- /dev/null
+++ b/extra_addons/pos_barcode_rule_transform/static/src/js/barcode.js
@@ -0,0 +1,148 @@
+///*
+// Copyright (C) 2019-Today: Druidoo (https://www.druidoo.io)
+// @author: Iván Todorovich
+// License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+//*/
+
+odoo.define('pos_barcode_rule_transform.BarcodeParser', function (require) {
+ "use strict";
+
+ var BarcodeParser = require('barcodes.BarcodeParser');
+ var Model = require('web.Model');
+
+ /*
+ Include some hooks. Nothing more
+ Could be moved to a standalone module
+ */
+ BarcodeParser.include({
+
+ _barcode_rule_query_fields: function() {
+ return ['name', 'sequence', 'type', 'encoding', 'pattern', 'alias'];
+ },
+
+ /*
+ Overload to add hooks:
+ _barcode_rule_query_fields
+ */
+ load: function(){
+ var self = this;
+ return new Model('barcode.nomenclature')
+ .query(['name','rule_ids','upc_ean_conv'])
+ .filter([['id','=',this.nomenclature_id[0]]])
+ .first()
+ .then(function(nomenclature){
+ self.nomenclature = nomenclature;
+ return new Model('barcode.rule')
+ //.query(['name','sequence','type','encoding','pattern','alias'])
+ .query(self._barcode_rule_query_fields())
+ .filter([['barcode_nomenclature_id','=',self.nomenclature.id ]])
+ .all();
+ }).then(function(rules){
+ rules = rules.sort(function(a,b){ return a.sequence - b.sequence; });
+ self.nomenclature.rules = rules;
+ });
+ },
+
+
+ /*
+ Overload to add hooks:
+ _apply_rule_parsed_result
+ */
+ parse_barcode: function(barcode){
+ var parsed_result = {
+ encoding: '',
+ type:'error',
+ code:barcode,
+ base_code: barcode,
+ value: 0,
+ };
+
+ if (!this.nomenclature) {
+ return parsed_result;
+ }
+
+ var rules = this.nomenclature.rules;
+ for (var i = 0; i < rules.length; i++) {
+ var rule = rules[i];
+ var res = this.try_rule(parsed_result, barcode, rule);
+ if (res) { return res; }
+ }
+ return parsed_result;
+ },
+
+ try_rule: function(parsed_result, barcode, rule) {
+ var cur_barcode = barcode;
+ if ( rule.encoding === 'ean13' &&
+ this.check_encoding(barcode,'upca') &&
+ this.nomenclature.upc_ean_conv in {'upc2ean':'','always':''} ){
+ cur_barcode = '0' + cur_barcode;
+ } else if (rule.encoding === 'upca' &&
+ this.check_encoding(barcode,'ean13') &&
+ barcode[0] === '0' &&
+ this.upc_ean_conv in {'ean2upc':'','always':''} ){
+ cur_barcode = cur_barcode.substr(1,12);
+ }
+
+ if (!this.check_encoding(cur_barcode,rule.encoding)) {
+ return false;
+ }
+
+ var match = this.match_pattern(cur_barcode, rule.pattern, rule.encoding);
+ if (match.match) {
+ if(rule.type === 'alias') {
+ barcode = rule.alias;
+ parsed_result.code = barcode;
+ parsed_result.type = 'alias';
+ } else {
+ parsed_result.encoding = rule.encoding;
+ parsed_result.type = rule.type;
+ parsed_result.value = match.value;
+ parsed_result.code = cur_barcode;
+ if (rule.encoding === "ean13"){
+ parsed_result.base_code = this.sanitize_ean(match.base_code);
+ } else {
+ parsed_result.base_code = match.base_code;
+ }
+ return parsed_result;
+ }
+ }
+ },
+
+ });
+
+
+ /*
+ Actual implementation of barcode transform
+ */
+ BarcodeParser.include({
+ _barcode_rule_query_fields: function() {
+ var res = this._super.apply(this, arguments);
+ res.push('transform_expr');
+ return res;
+ },
+
+ try_rule: function(parsed_result, barcode, rule) {
+ var res = this._super.apply(this, arguments);
+ if (res && res.value && rule.transform_expr) {
+ try {
+ res.original_value = res.value;
+ var new_value = py.eval(rule.transform_expr, {
+ value: res.value,
+ code: res.code,
+ barcode: res.code,
+ });
+ if (typeof new_value !== "number") {
+ throw new TypeError('Transformed value should be a Number. Got this instead: ' + new_value + ' (' + typeof new_value + ')')
+ }
+ res.value = new_value;
+ } catch(err) {
+ console.error('Unable to apply transform expression:', rule.transform_expr, err)
+ }
+ }
+ return res;
+ },
+ });
+
+ return BarcodeParser;
+
+});
diff --git a/extra_addons/pos_barcode_rule_transform/views/assets.xml b/extra_addons/pos_barcode_rule_transform/views/assets.xml
new file mode 100644
index 0000000000..52ccdad28a
--- /dev/null
+++ b/extra_addons/pos_barcode_rule_transform/views/assets.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/extra_addons/pos_barcode_rule_transform/views/barcode_rule.xml b/extra_addons/pos_barcode_rule_transform/views/barcode_rule.xml
new file mode 100644
index 0000000000..32af3bd5f6
--- /dev/null
+++ b/extra_addons/pos_barcode_rule_transform/views/barcode_rule.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+ barcode.rule
+ 999
+
+
+
+
+
+
diff --git a/extra_addons/web_widget_color/i18n/web_widget_color.pot b/extra_addons/web_widget_color/i18n/web_widget_color.pot
deleted file mode 100644
index c3c86c113a..0000000000
--- a/extra_addons/web_widget_color/i18n/web_widget_color.pot
+++ /dev/null
@@ -1,14 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
-"Report-Msgid-Bugs-To: \n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
diff --git a/extra_addons/web_widget_color/static/lib/jscolor/arrow.gif b/extra_addons/web_widget_color/static/lib/jscolor/arrow.gif
new file mode 100644
index 0000000000..246478a864
Binary files /dev/null and b/extra_addons/web_widget_color/static/lib/jscolor/arrow.gif differ
diff --git a/extra_addons/web_widget_color/static/lib/jscolor/cross.gif b/extra_addons/web_widget_color/static/lib/jscolor/cross.gif
new file mode 100644
index 0000000000..0ee9c7ac51
Binary files /dev/null and b/extra_addons/web_widget_color/static/lib/jscolor/cross.gif differ
diff --git a/extra_addons/web_widget_color/static/lib/jscolor/demo.html b/extra_addons/web_widget_color/static/lib/jscolor/demo.html
new file mode 100644
index 0000000000..cb86066490
--- /dev/null
+++ b/extra_addons/web_widget_color/static/lib/jscolor/demo.html
@@ -0,0 +1,12 @@
+
+
+ jscolor demo
+
+
+
+
+
+ Click here:
+
+
+
diff --git a/extra_addons/web_widget_color/static/lib/jscolor/hs.png b/extra_addons/web_widget_color/static/lib/jscolor/hs.png
new file mode 100644
index 0000000000..3d94486ced
Binary files /dev/null and b/extra_addons/web_widget_color/static/lib/jscolor/hs.png differ
diff --git a/extra_addons/web_widget_color/static/lib/jscolor/hv.png b/extra_addons/web_widget_color/static/lib/jscolor/hv.png
new file mode 100644
index 0000000000..1c5e01f8bc
Binary files /dev/null and b/extra_addons/web_widget_color/static/lib/jscolor/hv.png differ
diff --git a/extra_addons/web_widget_color/static/lib/jscolor/jscolor.js b/extra_addons/web_widget_color/static/lib/jscolor/jscolor.js
new file mode 100644
index 0000000000..47c89616b9
--- /dev/null
+++ b/extra_addons/web_widget_color/static/lib/jscolor/jscolor.js
@@ -0,0 +1,1010 @@
+/**
+ * jscolor, JavaScript Color Picker
+ *
+ * @version 1.4.4
+ * @license GNU Lesser General Public License, http://www.gnu.org/copyleft/lesser.html
+ * @author Jan Odvarko, http://odvarko.cz
+ * @created 2008-06-15
+ * @updated 2014-12-09
+ * @link http://jscolor.com
+ */
+
+
+var jscolor = {
+
+
+ dir : '', // location of jscolor directory (leave empty to autodetect)
+ bindClass : 'color', // class name
+ binding : true, // automatic binding via
+ preloading : true, // use image preloading?
+
+
+ install : function() {
+ jscolor.addEvent(window, 'load', jscolor.init);
+ },
+
+
+ init : function() {
+ if(jscolor.binding) {
+ jscolor.bind();
+ }
+ if(jscolor.preloading) {
+ jscolor.preload();
+ }
+ },
+
+
+ getDir : function() {
+ if(!jscolor.dir) {
+ var detected = jscolor.detectDir();
+ jscolor.dir = detected!==false ? detected : 'jscolor/';
+ }
+ return jscolor.dir;
+ },
+
+
+ detectDir : function() {
+ var base = location.href;
+
+ var e = document.getElementsByTagName('base');
+ for(var i=0; i vs[a] ?
+ (-vp[a]+tp[a]+ts[a]/2 > vs[a]/2 && tp[a]+ts[a]-ps[a] >= 0 ? tp[a]+ts[a]-ps[a] : tp[a]) :
+ tp[a],
+ -vp[b]+tp[b]+ts[b]+ps[b]-l+l*c > vs[b] ?
+ (-vp[b]+tp[b]+ts[b]/2 > vs[b]/2 && tp[b]+ts[b]-l-l*c >= 0 ? tp[b]+ts[b]-l-l*c : tp[b]+ts[b]-l+l*c) :
+ (tp[b]+ts[b]-l+l*c >= 0 ? tp[b]+ts[b]-l+l*c : tp[b]+ts[b]-l-l*c)
+ ];
+ }
+ drawPicker(pp[a], pp[b]);
+ }
+ };
+
+
+ this.importColor = function() {
+ if(!valueElement) {
+ this.exportColor();
+ } else {
+ if(!this.adjust) {
+ if(!this.fromString(valueElement.value, leaveValue)) {
+ styleElement.style.backgroundImage = styleElement.jscStyle.backgroundImage;
+ styleElement.style.backgroundColor = styleElement.jscStyle.backgroundColor;
+ styleElement.style.color = styleElement.jscStyle.color;
+ this.exportColor(leaveValue | leaveStyle);
+ }
+ } else if(!this.required && /^\s*$/.test(valueElement.value)) {
+ valueElement.value = '';
+ styleElement.style.backgroundImage = styleElement.jscStyle.backgroundImage;
+ styleElement.style.backgroundColor = styleElement.jscStyle.backgroundColor;
+ styleElement.style.color = styleElement.jscStyle.color;
+ this.exportColor(leaveValue | leaveStyle);
+
+ } else if(this.fromString(valueElement.value)) {
+ // OK
+ } else {
+ this.exportColor();
+ }
+ }
+ };
+
+
+ this.exportColor = function(flags) {
+ if(!(flags & leaveValue) && valueElement) {
+ var value = this.toString();
+ if(this.caps) { value = value.toUpperCase(); }
+ if(this.hash) { value = '#'+value; }
+ valueElement.value = value;
+ }
+ if(!(flags & leaveStyle) && styleElement) {
+ styleElement.style.backgroundImage = "none";
+ styleElement.style.backgroundColor =
+ '#'+this.toString();
+ styleElement.style.color =
+ 0.213 * this.rgb[0] +
+ 0.715 * this.rgb[1] +
+ 0.072 * this.rgb[2]
+ < 0.5 ? '#FFF' : '#000';
+ }
+ if(!(flags & leavePad) && isPickerOwner()) {
+ redrawPad();
+ }
+ if(!(flags & leaveSld) && isPickerOwner()) {
+ redrawSld();
+ }
+ };
+
+
+ this.fromHSV = function(h, s, v, flags) { // null = don't change
+ if(h !== null) { h = Math.max(0.0, this.minH, Math.min(6.0, this.maxH, h)); }
+ if(s !== null) { s = Math.max(0.0, this.minS, Math.min(1.0, this.maxS, s)); }
+ if(v !== null) { v = Math.max(0.0, this.minV, Math.min(1.0, this.maxV, v)); }
+
+ this.rgb = HSV_RGB(
+ h===null ? this.hsv[0] : (this.hsv[0]=h),
+ s===null ? this.hsv[1] : (this.hsv[1]=s),
+ v===null ? this.hsv[2] : (this.hsv[2]=v)
+ );
+
+ this.exportColor(flags);
+ };
+
+
+ this.fromRGB = function(r, g, b, flags) { // null = don't change
+ if(r !== null) { r = Math.max(0.0, Math.min(1.0, r)); }
+ if(g !== null) { g = Math.max(0.0, Math.min(1.0, g)); }
+ if(b !== null) { b = Math.max(0.0, Math.min(1.0, b)); }
+
+ var hsv = RGB_HSV(
+ r===null ? this.rgb[0] : r,
+ g===null ? this.rgb[1] : g,
+ b===null ? this.rgb[2] : b
+ );
+ if(hsv[0] !== null) {
+ this.hsv[0] = Math.max(0.0, this.minH, Math.min(6.0, this.maxH, hsv[0]));
+ }
+ if(hsv[2] !== 0) {
+ this.hsv[1] = hsv[1]===null ? null : Math.max(0.0, this.minS, Math.min(1.0, this.maxS, hsv[1]));
+ }
+ this.hsv[2] = hsv[2]===null ? null : Math.max(0.0, this.minV, Math.min(1.0, this.maxV, hsv[2]));
+
+ // update RGB according to final HSV, as some values might be trimmed
+ var rgb = HSV_RGB(this.hsv[0], this.hsv[1], this.hsv[2]);
+ this.rgb[0] = rgb[0];
+ this.rgb[1] = rgb[1];
+ this.rgb[2] = rgb[2];
+
+ this.exportColor(flags);
+ };
+
+
+ this.fromString = function(hex, flags) {
+ var m = hex.match(/^\W*([0-9A-F]{3}([0-9A-F]{3})?)\W*$/i);
+ if(!m) {
+ return false;
+ } else {
+ if(m[1].length === 6) { // 6-char notation
+ this.fromRGB(
+ parseInt(m[1].substr(0,2),16) / 255,
+ parseInt(m[1].substr(2,2),16) / 255,
+ parseInt(m[1].substr(4,2),16) / 255,
+ flags
+ );
+ } else { // 3-char notation
+ this.fromRGB(
+ parseInt(m[1].charAt(0)+m[1].charAt(0),16) / 255,
+ parseInt(m[1].charAt(1)+m[1].charAt(1),16) / 255,
+ parseInt(m[1].charAt(2)+m[1].charAt(2),16) / 255,
+ flags
+ );
+ }
+ return true;
+ }
+ };
+
+
+ this.toString = function() {
+ return (
+ (0x100 | Math.round(255*this.rgb[0])).toString(16).substr(1) +
+ (0x100 | Math.round(255*this.rgb[1])).toString(16).substr(1) +
+ (0x100 | Math.round(255*this.rgb[2])).toString(16).substr(1)
+ );
+ };
+
+
+ function RGB_HSV(r, g, b) {
+ var n = Math.min(Math.min(r,g),b);
+ var v = Math.max(Math.max(r,g),b);
+ var m = v - n;
+ if(m === 0) { return [ null, 0, v ]; }
+ var h = r===n ? 3+(b-g)/m : (g===n ? 5+(r-b)/m : 1+(g-r)/m);
+ return [ h===6?0:h, m/v, v ];
+ }
+
+
+ function HSV_RGB(h, s, v) {
+ if(h === null) { return [ v, v, v ]; }
+ var i = Math.floor(h);
+ var f = i%2 ? h-i : 1-(h-i);
+ var m = v * (1 - s);
+ var n = v * (1 - s*f);
+ switch(i) {
+ case 6:
+ case 0: return [v,n,m];
+ case 1: return [n,v,m];
+ case 2: return [m,v,n];
+ case 3: return [m,n,v];
+ case 4: return [n,m,v];
+ case 5: return [v,m,n];
+ }
+ }
+
+
+ function removePicker() {
+ delete jscolor.picker.owner;
+ document.getElementsByTagName('body')[0].removeChild(jscolor.picker.boxB);
+ }
+
+
+ function drawPicker(x, y) {
+ if(!jscolor.picker) {
+ jscolor.picker = {
+ box : document.createElement('div'),
+ boxB : document.createElement('div'),
+ pad : document.createElement('div'),
+ padB : document.createElement('div'),
+ padM : document.createElement('div'),
+ sld : document.createElement('div'),
+ sldB : document.createElement('div'),
+ sldM : document.createElement('div'),
+ btn : document.createElement('div'),
+ btnS : document.createElement('span'),
+ btnT : document.createTextNode(THIS.pickerCloseText)
+ };
+ for(var i=0,segSize=4; i
+
coop_default_pricetag.report_pricetag
+
+
+ Default pricetag model with barcode
+ coop_default_pricetag.report_pricetag_barcode
+
+
diff --git a/intercoop_addons/coop_default_pricetag/report/coop_custom_product_report.xml b/intercoop_addons/coop_default_pricetag/report/coop_custom_product_report.xml
index b14315931e..5765f2e50e 100644
--- a/intercoop_addons/coop_default_pricetag/report/coop_custom_product_report.xml
+++ b/intercoop_addons/coop_default_pricetag/report/coop_custom_product_report.xml
@@ -1,5 +1,6 @@
+
+
+
+
+
+
diff --git a/intercoop_addons/coop_default_pricetag/report/report_pricetag.py b/intercoop_addons/coop_default_pricetag/report/report_pricetag.py
index 38498f28b9..725b291340 100644
--- a/intercoop_addons/coop_default_pricetag/report/report_pricetag.py
+++ b/intercoop_addons/coop_default_pricetag/report/report_pricetag.py
@@ -3,8 +3,8 @@
from openerp import api, models
-class ReportPricetag(models.AbstractModel):
- _name = 'report.coop_default_pricetag.report_pricetag'
+class ReportPricetagBase(models.AbstractModel):
+ _name = 'report.coop_default_pricetag.report_pricetag_base'
@api.model
def _get_products(self, lines, fields):
@@ -43,3 +43,13 @@ def render_html(self, data):
}
return self.env['report'].render(
report_model, docargs)
+
+
+class ReportPricetag(models.AbstractModel):
+ _name = 'report.coop_default_pricetag.report_pricetag'
+ _inherit = 'report.coop_default_pricetag.report_pricetag_base'
+
+
+class ReportPricetagBarcode(models.AbstractModel):
+ _name = 'report.coop_default_pricetag.report_pricetag_barcode'
+ _inherit = 'report.coop_default_pricetag.report_pricetag_base'
diff --git a/intercoop_addons/coop_default_pricetag/report/report_pricetag.xml b/intercoop_addons/coop_default_pricetag/report/report_pricetag.xml
index 17e27a133a..1fe0cdf682 100644
--- a/intercoop_addons/coop_default_pricetag/report/report_pricetag.xml
+++ b/intercoop_addons/coop_default_pricetag/report/report_pricetag.xml
@@ -5,6 +5,7 @@
+
+
+
+
+
+
+
diff --git a/intercoop_addons/coop_default_pricetag/static/src/css/pricetag.css b/intercoop_addons/coop_default_pricetag/static/src/css/pricetag.css
index d79fb57a32..d8cfd523d5 100644
--- a/intercoop_addons/coop_default_pricetag/static/src/css/pricetag.css
+++ b/intercoop_addons/coop_default_pricetag/static/src/css/pricetag.css
@@ -68,4 +68,32 @@
.pricetag_shelf_coopinfos{
width: 100%;
height: 60%;
-}
\ No newline at end of file
+}
+
+/*
+ PriceTag Barcode
+*/
+
+.pricetag.pricetag-barcode .label_top {
+ margin-bottom: 0px;
+
+}
+
+.pricetag.pricetag-barcode .product_shelf_rackinfo_barcode {
+ height: 40%;
+ position: relative;
+}
+
+.pricetag.pricetag-barcode .product_shelf_rackinfo_barcode .barcode_image {
+ padding: 0;
+ height: 25px;
+ width: 80%;
+ position: absolute;
+ right: 0;
+ top: -5px;
+ z-index: -9999;
+}
+
+.pricetag.pricetag-barcode .product_shelf_coopinfos {
+ height: 45%;
+}
diff --git a/intercoop_addons/coop_membership/__openerp__.py b/intercoop_addons/coop_membership/__openerp__.py
index 32d76a4f9d..04b360cefe 100644
--- a/intercoop_addons/coop_membership/__openerp__.py
+++ b/intercoop_addons/coop_membership/__openerp__.py
@@ -27,6 +27,7 @@
'email_pos_receipt',
'create_users_partners',
'l10n_fr_pos_cert_base',
+ 'purchase_discount',
],
'data': [
'data/update_template_name_ftop.yml',
@@ -91,13 +92,12 @@
'data/res_partner_inform.xml',
'data/shift_extension_type_data.xml',
'data/ir_config_paramater.xml',
- 'data/function.xml',
# Report
'views/account_report.xml',
# Custom function
- 'data/function.xml',
+ # 'data/function.xml',
],
'demo': [
'demo/capital_fundraising_category.xml',
diff --git a/intercoop_addons/coop_membership/i18n/fr.po b/intercoop_addons/coop_membership/i18n/fr.po
index 74a4d91ddb..f38b013f90 100644
--- a/intercoop_addons/coop_membership/i18n/fr.po
+++ b/intercoop_addons/coop_membership/i18n/fr.po
@@ -1954,6 +1954,11 @@ msgstr "Numero"
msgid "Designated buyer"
msgstr "Acheteur désigné"
+#. module: coop_membership
+#: model:ir.model.fields,field_description:coop_membership.field_res_partner_leader_ids
+msgid "Shift Leaders"
+msgstr "Coordinateurs"
+
#. module: coop_shift
#: selection:shift.leave,state:0
msgid "Not finished"
diff --git a/intercoop_addons/coop_membership/models/shift_extension.py b/intercoop_addons/coop_membership/models/shift_extension.py
index be0f6eb06d..99b38516fa 100644
--- a/intercoop_addons/coop_membership/models/shift_extension.py
+++ b/intercoop_addons/coop_membership/models/shift_extension.py
@@ -6,16 +6,20 @@
from openerp import api, fields, models, _
from dateutil.relativedelta import relativedelta
from openerp.exceptions import ValidationError
+from datetime import date
class ShiftExtension(models.Model):
_inherit = 'shift.extension'
+ _order = 'date_start desc, partner_id'
reduce_deduction = fields.Boolean(string="Reduced Deduction")
is_show_reduce_deduction = fields.Boolean(
compute="_compute_show_reduce_deduction",
string="Is Show Reduced Deduction",
store=True)
+ current_extension = fields.Boolean(compute='_compute_current_extension',
+ store=False)
@api.onchange('type_id', 'partner_id', 'date_start')
def onchange_type_id(self):
@@ -28,6 +32,15 @@ def onchange_type_id(self):
partner=extension.partner_id,
date_start=extension.date_start)
+ @api.depends('date_start', 'date_stop')
+ def _compute_current_extension(self):
+ today_date = str(date.today())
+ for ext in self:
+ if ext.date_start <= today_date and ext.date_stop >= today_date:
+ ext.current_extension = True
+ else:
+ ext.current_extension = False
+
@api.multi
@api.depends('partner_id.shift_type', 'type_id.extension_method')
def _compute_show_reduce_deduction(self):
diff --git a/intercoop_addons/coop_membership/security/ir.model.access.csv b/intercoop_addons/coop_membership/security/ir.model.access.csv
index 99b6233a03..7421b44e86 100644
--- a/intercoop_addons/coop_membership/security/ir.model.access.csv
+++ b/intercoop_addons/coop_membership/security/ir.model.access.csv
@@ -34,3 +34,5 @@ access_model_shift_change_team,access_model_shift_change_team,coop_membership.mo
,,,,,,,
access_model_shift_credit_config_group_employee,access_model_shift_credit_config_group_employee,coop_membership.model_shift_credit_config,base.group_user,1,0,0,0
access_model_shift_credit_config_group_manage_leave,access_model_shift_credit_config_group_manage_leave,coop_membership.model_shift_credit_config,coop_shift.group_shift_manage_leave,1,1,1,1
+access_model_res_users_bdm_saisie_group,access_model_res_users_bdm_saisie,base.model_res_users,coop_membership.group_membership_bdm_saisie,1,1,1,0
+access_model_res_partner_bdm_presence_group,access_model_res_partner_bdm_presence_group,base.model_res_partner,coop_membership.group_membership_bdm_presence,1,1,0,0
diff --git a/intercoop_addons/coop_membership/security/ir_model_access.yml b/intercoop_addons/coop_membership/security/ir_model_access.yml
index 1dd55f6814..5b1799d010 100644
--- a/intercoop_addons/coop_membership/security/ir_model_access.yml
+++ b/intercoop_addons/coop_membership/security/ir_model_access.yml
@@ -346,7 +346,7 @@
name: bdm.presence.shift.template.registration.line.user
perm_create: false
perm_read: true
- perm_write: false
+ perm_write: true
perm_unlink: false
-
!record {model: ir.model.access, id: bdm_presence_shift_template_registration_user}:
@@ -599,9 +599,9 @@
group_id: coop_membership.group_membership_bdm_saisie
model_id: coop_membership.model_shift_counter_event
name: bdm.saisie.shift.counter.event
- perm_create: true
+ perm_create: false
perm_read: true
- perm_write: true
+ perm_write: false
perm_unlink: false
-
!record {model: ir.model.access, id: bdm_saisie_shift_change_team_user}:
diff --git a/intercoop_addons/coop_membership/views/menu.xml b/intercoop_addons/coop_membership/views/menu.xml
index 4f09a830d2..541595bfc4 100644
--- a/intercoop_addons/coop_membership/views/menu.xml
+++ b/intercoop_addons/coop_membership/views/menu.xml
@@ -68,7 +68,8 @@
3
@@ -236,6 +237,13 @@
sequence="22"
groups="coop_shift.group_shift_manager,coop_membership.group_membership_bdm_saisie"/>
+
+
+
Change Teams
+
+
+
+
+
+
+
+
+
+
+
| + | Recycler | +Stacker | +Total | +
|---|---|---|---|
Automatic Cashdrawer
+Inventory
+ ++
+
+
+
+
+ --------------------------------
+ User:
+ + + + +
+
+
+
+ x (
+
+
-
- -->
+
+
+
+
+ TOTAL
+ +
+
+
+
+
+
+
+
+ Automatic Cashdrawer
++
+
+
+
+
+ --------------------------------
+ User:
+ + + + +
+
+
+
+ +
--------------------------------
+ Statement:
+ REF:
+
@@ -48,4 +49,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Code:
+
+
+
+
+
+
+
+
+ Origine:
+
+
+ ![]()
+
+
+
+
+
+
+
+
You have some changes on this template. You should consider or
+
+
+
+
+