Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Auto merge TestMergeBot:12.0-automerge-1006fc323aa3d515c2c98faac5e140ecab986a81-12.0 #1075

Conversation

@TestMergeBot
Copy link

commented Aug 9, 2019

This is auto merge from TestMergeBot:12.0-automerge-1006fc323aa3d515c2c98faac5e140ecab986a81 to 12.0

KolushovAlexandr and others added 30 commits Mar 27, 2019
Merge pull request #640 from KolushovAlexandr/pos-addons-10.0-pos_jou…
…rnal_pin

🎉1️⃣0️⃣ pos_journal_pin
Merge branch 'pos-addons-10.0-pos_journal_pin' of github.com:it-proje…
…cts-llc/addons-dev into 10.0-pos_journal_pin-publication
Merge pull request #998 from KolushovAlexandr/10.0-pos_journal_pin-pu…
…blication

10.0 pos journal pin publication
Merge pull request #999 from KolushovAlexandr/10.0-pos_keyboard-enter…
…_key

🚑 enter did not work for some popups
Merge pull request #1000 from KolushovAlexandr/10.0-pos_multi_session…
…-offline_order

10.0 pos multi session offline order
Merge pull request #1010 from kaadevelop/10.0
🛡 services postgresql 10.0
Merge branch '10.0' of github.com:it-projects-llc/pos-addons into 10.…
…0-pos_order_cancel-empty_kitchen_order_deleting
🛡 postgres 9.5; update transifex settings; auto creating *.pot files
🛡 postgres 9.5; remove transifex settings; auto creating *.pot files
Merge pull request #1014 from kaadevelop/10.0
🛡 -postgres 9.5; -update transifex settings; -auto creating *.…
Merge pull request #977 from KolushovAlexandr/10.0-pos_order_cancel-e…
…mpty_kitchen_order_deleting

10.0 pos order cancel licenses
Merge pull request #1005 from KolushovAlexandr/10.0-pos_multi_session…
…-offline_order-2

🚑 error with orders have same numberspaid offline and onlin…
Merge pull request #1023 from Mirgalimova/10.0-images
📖 images for AppStore added
Merge branch '11.0' of github.com:it-projects-llc/pos-addons into 11.…
…0-d36d09312337d78205da81ce38de7c877a5f8b54
yelizariev and others added 16 commits Jun 24, 2019
Merge pull request #1033 from kaadevelop/11.0
🛡 travis.yml notifications webhook travis
Add devices
Galaxy Tab/Alcatel

- galaxy tab
Mozilla/5.0 (Linux; Android 6.0.1; Galaxy Tab 2)...

- 900[0-9][A-Z]
Mozilla/5.0 (Linux; Android 8.1.0; 9009G)...
Merge pull request #1042 from KolushovAlexandr/11.0-pos_product_avila…
…ble-customization

11.0 pos product avilable customization
⬆️1️⃣1️⃣ handled in 'main.js' 'get_cashier()';added string to docs, a…
…bout entering developer mode;edited commentaries (i.e. added contributors, changed ver from 10 to 11 etc.);refactoring;'model.py' - given superuser-rights for creating pos-session;'main.js' - redefined click-event on numpad in case if payment-line is empty';'manifest.py - defined price;
Merge pull request #1050 from Ark74/11.0
Add devices Galaxy Tab/Alcatel
n1nka
Merge pull request #1051 from fedoranvar/11.0-pos_journal_pin-port
⬆️1️⃣1️⃣ pos_journal_pin
Merge pull request #1068 from kaadevelop/11.0
🛡 travis.yml enable check tags
root
@@ -41,9 +45,34 @@ odoo.define('pos_product_available_negative.pos', function (require) {
models.Order = models.Order.extend({
export_as_JSON: function () {
var json = _super_order.export_as_JSON.apply(this, arguments);
json.negative_stock_user_id = this.negative_stock_user_id ? this.negative_stock_user_id.id : false;
json.negative_stock_user_id = this.negative_stock_user_id
? this.negative_stock_user_id.id

This comment has been minimized.

Copy link
@hound

hound bot Aug 9, 2019

Misleading line break before '?'; readers may interpret this as an expression boundary.

@yelizariev yelizariev closed this Aug 28, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
10 participants
You can’t perform that action at this time.