Commit Graph

124 Commits

Author SHA1 Message Date
Ronel Cabrera
fcb54762a1 feat(Contacts): select billing contact for sales invoice 2020-03-12 16:58:59 +08:00
Mangesh-Khairnar
6f6e3a940b
fix: return null for attribute (#20674) 2020-02-20 12:58:54 +05:30
Mangesh-Khairnar
2d7e024f00
fix: use system language to translate strings (#20673) 2020-02-20 12:24:29 +05:30
Deepesh Garg
16445305d5 fix: Styling and minor fixes 2020-02-18 18:04:09 +05:30
racitup
3c5bb80b5a fix: Plaid transaction import order, transaction_id duplicate check, added transaction category tags 2020-02-18 17:49:35 +05:30
racitup
9a47c3dc8c fix: Plaid automatic_synchronization TypeError on filter & add info log message #20343 2020-02-18 17:49:20 +05:30
Suraj Shetty
48e9bc3fc9 fix: Incorrect translation syntax 2020-01-29 15:06:18 +05:30
Nabin Hait
444156184c
fix: Plaid TypeError in add_bank_accounts (#20335) 2020-01-17 15:57:48 +05:30
Himanshu
9496b8453f fix(plaid): change json structure (#20189) 2020-01-06 00:17:16 +05:30
Saurabh
d3ed499854
Merge pull request #19416 from EconCode/shopify-connector-unregisterfix
fix: unregistering url wrong formatted string
2019-11-11 17:04:44 +05:30
Rucha Mahabal
b455318f01 fix(Integration): Woocommerce issues (#19487)
* fix: Delivery URL returned response code 500

* fix: set default company in Woocommerce Settings

* fix: remove redundant function calls

* fix: make offset configurable for delivery date in sales order

* fix: remove redundant code from woocommerce_settings.py

* fix: import create_custom_field

* fix: added ignore_mandatory for saving item, customer and sales order

* fix: remove unused woocommerce_check custom field

* fix: do not delete custom fields or item group when sync is disabled
2019-11-07 18:20:32 +05:30
Chinmay D. Pai
702f9f929b
chore: rename undefined variable in shopify_log
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-10-29 13:30:13 +05:30
Chinmay D. Pai
4f7885f1aa
chore: fix unexpected keyword in shopify_settings
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-10-29 13:20:17 +05:30
EconCode
07ae3abf34 fix: unregistering url wrong formated string
Fixed the formated string for unregistering webhooks.
String should look like:
"/admin/api/2019-04/webhooks/#{webhook_id}.json"

Taken from shopify api documentation - deleting webhooks:
https://help.shopify.com/en/api/reference/events/webhook?api[version]=2019-04#destroy-2019-04
2019-10-26 16:31:29 +02:00
Saurabh
bdc899857c Fix: Shopify payload operations logging (#19366)
* fix: payload logging for shopify

* fix: remove print statements
2019-10-22 12:31:56 +05:30
Saurabh
039679cad1
Merge branch 'develop' into shopify 2019-09-30 19:08:44 +05:30
Chinmay Pai
9d26c69c4a fix(amazon-mws): python3 compatibility changes (#19209)
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-09-30 16:59:42 +05:30
hrwx
ebc0e1ca8a fix: remove return statement 2019-09-30 14:56:39 +05:30
hrwx
bf09fbe6b9 fix: sku 2019-09-30 14:56:39 +05:30
hrwx
5c036d9aaf fix: permissions 2019-09-30 14:56:39 +05:30
hrwx
5aa8743024 changes 2019-09-30 14:56:39 +05:30
prssanna
c6b7695ab5 fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
c8ad8bb7aa fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
09f4e0b19c fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
a9aac02b90 fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
e64bdcd12b fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
f380b215b2 fix: shopify integration 2019-09-30 14:56:39 +05:30
Suraj Shetty
af2eac4334 fix: Create error log if something goes wrong while call log creation (#19055)
* fix: Create error log if something goes wrong while call log creation

- For better debbugging

* fix: Rollback if any error occurs during call log creation
2019-09-17 15:53:23 +05:30
Faris Ansari
4fe67236ed fix: Python 3 fixes for MWS Connector (#18986) 2019-09-17 12:57:51 +05:30
Chinmay Pai
b3c732daf5 refactor(plaid): move configuration from site_config to doctype (#18712)
* feat(plaid): move plaid from site_config to doctype

plaid requires accessing site_config and cloud users cannot access
site_config and hence, plaid integration doesn't work on the cloud.
Moving all the configuration from site_config to the Plaid Settings
doctype fixes this issue.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* feat(plaid): make changes to plaid_settings and add patch

* remove all references for get()-ing plaid variables from frappe.conf
  and replace them with values from doctype
* add patch to move all existing plaid settings variable values from
  frappe.conf to plaid_settings doctype

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* fix(plaid): use get_single_value for Plaid Settings

Co-Authored-By: Himanshu <himanshuwarekar@yahoo.com>

* chore: reload plaid_settings before running patch

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* chore: remove useless semicolon

fuck codacy

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-09-13 15:48:08 +05:30
Suraj Shetty
f43825e4dd fix: convert dict to list for iteration (#18963) 2019-09-09 13:23:01 +05:30
Himanshu
fffdb6f575 feat(Contacts): Multiple Emails in a Contact (#18675)
* feat: render multiple addresses

* feat: move to newer contacts structure

* fix: iterate over valid variable

* fix: use primary label instead of bold letters

* fix: call popup get contact name from number

* fix: make contact structure  call popup compatible

* fix: query

* fix: add city, state and country

* fix: display address

* fix: get address in single line

* fix: review fixes

* fix: translation strings

* fix: fix query for contacts

* fix: remove references of mobile_no
2019-09-02 15:57:45 +05:30
Rucha Mahabal
1707c3da95
fix: exception
Co-Authored-By: Himanshu <himanshuwarekar@yahoo.com>
2019-08-28 13:55:26 +05:30
Rucha Mahabal
9fa5dbd6e4 fix: raised exception in shopify 2019-08-28 13:29:03 +05:30
Suraj Shetty
7e818067eb
Merge branch 'develop' into refactor-call-popup 2019-08-08 19:18:03 +05:30
Aditya Hase
472050bb8a fix(quickbooks): Do not build global search for QuickBooks Migrator (#18628) 2019-08-08 15:48:35 +05:30
Suraj Shetty
4177ecb6b2 Merge branch 'develop' of github.com:frappe/erpnext into refactor-call-popup 2019-07-22 15:18:03 +05:30
Aditya Hase
195465cdd9 fix(tally): Ignore unhandled vouchers silently (#18430)
Vouchers that affect inventory entries but are not of type
Sales, Purchase, Credit Note, Debit Note are not handled.

Custom Vouchers are also not handled.
2019-07-22 11:18:11 +05:30
Suraj Shetty
f5dd494716 fix(call popup): Multiple changes
- Remove summary from call log use comments instead
- Add contact and lead if matched to the call log
- Add received by field with Employee Link
- DocPerm to allow Employees to have read access on call log
- Remove unwanted code
- Add a method to get lead just by providing phone number
- Show popup only to Employee to which the system is trying to connect.
- Remove custom code from call popup dialog and replace it with
 standard fields
- Increase timeout to hide popup after the call has been disconnected.
2019-07-16 11:07:25 +05:30
Aditya Hase
f04b19aa2e fix: Company might not have any warehouses when on_update hook for QBM is being executed
This used to throw while renaming a Company that is either used with QuickBooks
Migrator or is set as a Default Company in Global Defaults.
2019-07-11 18:29:24 +05:30
Aditya Hase
d4c10801d1 style: Remove multiple whitespace after : 2019-07-11 18:17:01 +05:30
Aditya Hase
7352227a24 fix: Remove unused local variable 2019-07-11 18:16:42 +05:30
Aditya Hase
2f6cd1999a style: One import per line 2019-07-11 18:16:23 +05:30
Aditya Hase
9f40ffcd1e style: Insert whitespace after , 2019-07-11 18:10:05 +05:30
Aditya Hase
dfeb6bef8c style: Remove whitespace before : 2019-07-11 18:08:46 +05:30
Aditya Hase
6bbb726769 fix: Remove unused imports 2019-07-11 18:04:41 +05:30
Anurag Mishra
841d852f41 refactor: added missing translation functions (#18143)
* fix: Translating Error and Messages

* Update erpnext/controllers/item_variant.py

Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>

* Update erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
2019-07-03 15:15:08 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch (#17997)
* fix: merge conflict

* fix: restored missing set_gst_state_and_state_number function

* fix: style linting as per codacy

* fix: Fixes related to customer/lead merging

* fix: merge conflict

* fix: Fixes related to customer/lead merging

* fix: Assign isue/opportunity to user

* fix: Assign isue/opportunity to user

* fix: Replaced Invoice type by GST Category

* fix: merge conflict

* fix: merge conflict

* fix: test cases

* fix: test cases
2019-07-03 10:34:31 +05:30
Suraj Shetty
502565ff56 fix: Make required changes 2019-07-01 14:28:59 +05:30
Suraj Shetty
19e4fde737 Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog 2019-06-30 15:30:59 +05:30