Commit Graph

312 Commits

Author SHA1 Message Date
Mangesh-Khairnar
c302d066a3
fix: only save end date when transactions are returned (#22023) 2020-05-29 10:19:58 +05:30
Mangesh-Khairnar
706524f1ae
fix: make transaction date of the oldest transaction as the last integration date (#22000)
* fix: make transaction date of the oldest transaction as the last integration date

* chore: remove blank line after docstring
2020-05-28 13:33:58 +05:30
Michelle Alva
8653419c4c
fix: change modified time
changed modified time to sync the changes
2020-05-28 12:52:58 +05:30
Michelle Alva
f7beeff2d8
fix: change description for field (#21995)
grammatical fixes for description of Default Customer
2020-05-28 11:05:19 +05:30
Mangesh-Khairnar
7402451b96
fix: shopify error message on failure of sales order creation (#21924) 2020-05-26 17:56:40 +05:30
Mangesh-Khairnar
ddc170521f
fix: check for warehouse in the woocommerce settings (#21925) 2020-05-26 17:55:56 +05:30
Shivam Mishra
d3d3836943
style: cleaner conditions and returns 2020-05-19 11:53:28 +05:30
Shivam Mishra
bdc97e6b48
Merge branch 'develop' into woocommerce-shipping 2020-05-16 19:40:45 +05:30
Shivam Mishra
d69e3eb5d7 feat: use name instead of customer name to link address and contact 2020-05-16 19:37:03 +05:30
Shivam Mishra
180bda7618 refactor: return address and contact objects 2020-05-16 19:20:55 +05:30
Shivam Mishra
fc514ba940 feat: save contact to woocommerce 2020-05-16 19:19:18 +05:30
Mangesh-Khairnar
4a9fd9ef6d fix: error log title for failing bank transactions 2020-05-13 16:11:22 +05:30
Gavin D'souza
cb1376b036 chore: verbose error message for coa recursion 2020-05-09 12:05:33 +05:30
Shivam Mishra
da41724d9d feat: save shipping address to woocommerce customer 2020-05-08 15:12:08 +05:30
Gavin D'souza
0c353a64a4 fix: un-using buggy JS frappe.new_doc 2020-05-02 18:58:33 +05:30
Gavin D'souza
af612ddb6d feat: maintain tally voucher numbers
feat: create seperate customer and supplier entries for same party if
case exists
2020-05-01 14:39:11 +05:30
Gavin D'souza
51305a028b feat: prompt that company and COA will be overwritten 2020-05-01 14:37:28 +05:30
gavin
c333797d67
Merge branch 'develop' into tally-migration-feat 2020-04-29 13:10:28 +05:30
Gavin D'souza
f4926a8205 fix: toggle read only for accounts post daybook data processing
style: code comments and updates
2020-04-29 11:21:16 +05:30
Gavin D'souza
6b850b7e71 perf: reduce JS memory heap and maintain namespaces 2020-04-29 10:25:18 +05:30
Gavin D'souza
0d61b35b0b fix: table cleanups, updated summary block 2020-04-28 18:13:10 +05:30
Gavin D'souza
27b7172fa4 fix: run summary logger
style: indent fixes
2020-04-28 16:32:15 +05:30
Gavin D'souza
2e1b531f4f feat: handle resolve and unresolved errors
restructured and reused components
2020-04-28 16:04:49 +05:30
Gavin D'souza
640636bbcd feat: maintain logs of errors successfully fixed 2020-04-28 16:01:59 +05:30
Gavin D'souza
1b5eea691c feat: order failed import log by creation, handle rollbacks and commits 2020-04-28 15:51:40 +05:30
Gavin D'souza
0805307514 perf: reduce failed_error_log size 2020-04-27 13:42:00 +05:30
Gavin D'souza
82e7a9de28 feat: error log handling
fix: toggle required accounts
2020-04-27 13:12:38 +05:30
Gavin D'souza
38c677689d fix: set default round off acount 2020-04-27 11:50:16 +05:30
Gavin D'souza
2de4a5a7c8 feat: Error logging via doc
fix: Handle duplicate company and COA
feat: Error logging via doc
feat: fetch defaults for accounts
2020-04-27 11:34:00 +05:30
Gavin D'souza
defeb73747 feat: Add Failed error logs
fix: set defaults
2020-04-27 11:32:49 +05:30
Nabin Hait
ad16e61bc2
fix: Valid warehouse in woocommerce syncing and other small fixes (#21407)
* fix: Valid warehouse in woocommerce syncing

* fix: dmall fixes in gross & net profit report

* fix: company is required for getting party details

* fix: None issue while getting raw material rate based on last purchase rate
2020-04-25 14:52:05 +05:30
Deepesh Garg
b1e68bd022
fix: Rename bank account type doctypes (#21179)
* fix: Rename bank account type doctypes

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2020-04-23 12:19:30 +05:30
gavin
25932e0613
Merge pull request #21298 from gavindsouza/tally-migration-fixes
fix: Tally migration
2020-04-17 19:12:55 +05:30
Gavin D'souza
496c6a3baa style: removed unused imports and updated formatting 2020-04-16 16:51:59 +05:30
Gavin D'souza
6abdfc586b fix: strip data fields of whitespaces 2020-04-16 16:14:29 +05:30
Gavin D'souza
72a94941bf fix(tally-migration): DocType improvement 2020-04-16 16:12:40 +05:30
Gavin D'souza
2ad7e81560 fix: handle errors in enqueued methods and update status 2020-04-16 16:11:55 +05:30
Mangesh-Khairnar
49816b0c5f
fix(MWS): add new regions to marketplace (#21196)
* fix(MWS): add marketplace region for uae

* fix: rename the fields for mws integrations

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-08 12:57:14 +05:30
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
Karthikeyan S
48535e95e6 Fix(integrations): Adding Error Logs for Woocommerce (#18061)
(cherry picked from commit ae255d6328b70b148d28d9a88a695932656bf276)
2019-06-26 13:41:49 +05:30
Suraj Shetty
d4420afb72 chore: Remove unwanted files 2019-06-19 18:33:56 +05:30
Suraj Shetty
8b95b61aa0 fix: Remove unwanted code 2019-06-17 14:17:21 +05:30
Suraj Shetty
340ccb6c96 fix: Remove unwanted code 2019-06-17 10:16:38 +05:30
Suraj Shetty
5ea6a5e33a fix: Decouple call popup from exotel 2019-06-17 08:46:38 +05:30
Suraj Shetty
3fdeffff7a feat: Add medium field in call log doctype 2019-06-17 08:27:00 +05:30
Suraj Shetty
be1dddd596 feat: Add call recording URL field to call log 2019-06-17 08:06:14 +05:30
Suraj Shetty
06f8034542 refactor: Remove redundant code 2019-06-13 17:13:54 +05:30
Suraj Shetty
2f84779667 fix: Last Communication for lead
- Remove unused code
- Remove unused import
2019-06-12 10:31:07 +05:30
Suraj Shetty
c8c17422f7 fix: Change call log fieldname and some cleanups 2019-06-07 10:22:50 +05:30
Suraj Shetty
97780613ad fix: Improve call popup UI 2019-06-06 14:48:37 +05:30
Suraj Shetty
87645e98ad fix: Get available employees from communication medium 2019-06-06 11:24:31 +05:30
Suraj Shetty
44c0e9d549 fix: Create call log instead of communication 2019-06-06 11:18:16 +05:30
Suraj Shetty
d1668e22d1 Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog 2019-06-03 12:36:45 +05:30
Suraj Shetty
e9bfecf405 fix: Add code to update call summary 2019-06-03 12:27:02 +05:30
Suraj Shetty
bd03a51e8f fix: Handle end call 2019-05-27 15:30:41 +05:30
Saurabh
fdf0d91087 fix: add shopify_supplier_id custom field while setting up shopify 2019-05-27 15:17:58 +05:30
Suraj Shetty
39a4d59cf6 fix: Call popup modal 2019-05-27 10:38:43 +05:30
Suraj Shetty
07fe299628 fix: Make changes to fix call flow and popup trigger 2019-05-22 15:48:57 +05:30
Suraj Shetty
1eeb89fb77 feat: Add get_call status & make a call function 2019-05-22 06:37:43 +05:30
Suraj Shetty
57bab84198 feat: Add exotel settings 2019-05-22 06:25:45 +05:30
Suraj Shetty
863b93c32d refator: Rename files and move code 2019-05-21 07:57:06 +05:30
Nabin Hait
240008d7c6 fix: Multilingual handling in woocommerce integration 2019-05-01 19:18:40 +05:30
Aditya Hase
8afeda924d fix: Use all address lines instead of only first two 2019-04-29 13:09:23 +05:30
Aditya Hase
ba61be93ae refactor: Major changes 2019-04-29 06:00:27 +05:30
Aditya Hase
b6e9eb9784 feat(tally): Preprocess and create items and uoms 2019-04-28 19:24:58 +05:30
Aditya Hase
27ab5b540b fix(tally): Use LEDSTATENAME instead of STATENAME 2019-04-28 19:24:58 +05:30
Aditya Hase
f2202cf638 feat(tally): Preprocess and create parties and addresses 2019-04-28 19:24:58 +05:30
Aditya Hase
0668482f82 feat(tally): Create chart of accounts from tally master data 2019-04-28 19:24:58 +05:30
Aditya Hase
55d465f3ad feat(tally): Preprocess master data to generate COA 2019-04-28 19:24:58 +05:30
Aditya Hase
9a84a99ac0 feat(tally): Add Tally Migration DocType 2019-04-28 19:24:58 +05:30
karthikeyan5
69f0ce178e fix(woocommerce integration): error in new-site
resolving "Could not find UOM: Nos" error in travis

(cherry picked from commit 97383716e633ae0911238fc02ffc659ad705b41a)
2019-04-15 19:47:13 +05:30
karthikeyan5
307e6a8825 fix(woocommerce integration): defaults in settings
(cherry picked from commit f788117b3ea9be83c54e169a1535ded0722f229c)
2019-04-15 19:47:02 +05:30
karthikeyan5
2b0a8de74f fix(woocommerce integration): fixing 403 error
(cherry picked from commit 6784335e2ca3ea8883f08b3d94101f525f37bf1e)
2019-04-15 19:45:38 +05:30
Nabin Hait
89206e74d0 fixed merge conflict 2019-04-11 12:31:14 +05:30
Rushabh Mehta
e7b6b46309
Merge pull request #17109 from PawanMeh/fixes_16894_v11
fix: Amazon v11 integration issues
2019-04-03 22:54:43 +05:30
hello@openetech.com
ea00f8cbc3 [fix] #16894 2019-04-02 14:22:23 +05:30
Nabin Hait
f9f04ed89e fix: woocommerce settings 2019-03-30 17:39:40 +05:30
pawan
c0e1000919 fix: SKU issue 2019-03-11 14:58:17 +05:30
pawan
7c3e017ac3 fix: Amazon integration issues 2019-03-11 14:47:57 +05:30
Sagar Vora
551f52fd25 Merge branch 'master' into develop 2019-02-12 16:41:24 +05:30
Aditya Hase
b9dc031e86 fix(py3): Use range instead of xrange 2019-02-07 18:10:30 +05:30
Himanshu
088886e082 Remove illegal character after break (#16589) 2019-02-07 07:09:20 +05:30
Aditya Hase
f3c22f342c fix(unicode): Import unicode_literals in every file 2019-01-22 18:36:10 +05:30
Aditya Hase
007fbfbfb7
[Feature] ERPNext Quickbooks Migrator (#15718)
* Create QuickBooks Connector Single DocType

* Create interface for user authorization and obtaining authorization code

* Obtain Access token using authorization code

* Fetch a random customer

* Schedule fetching as a background job

* Save fetched customer

* Fetch all customers, take care of pagination

* Save fetched customers

* Create a custom field for storing Quickbooks ID

* Don't save already saved customers

* Commit every successful insert

* No need of allow_guest=True

* Fetch Items as well

* Store Customer Addresses as well.

* Remove redundant custom field creation code

* Stupid refactoring

* Some more refactoring

* Fetch and Save Suppliers as well

* Save accounts. Really a hack as of now.

* Fetch and save invoices, Take care of child items as well

* Fetch Taxes as well

* Set currency on Sales Invoice

* Correctly Link Items, Handle markups

* Don't enqueue, Need to wait forever for testing sometimes

* Set margin rate correctly

* Correct fieldname is tax_amount not amount

* Fetch with maximum possible batch size

* Don't print unnecessary info

* Fetch Journal Entries

* Fetch Purchase Invoices (Bill)

* Don't perform reauthentication if you already have an access_token

* Don't need those print statements anymore

* Refresh access_token if request fails

* Fetch Payment Entry(Payment)

* Map QB items to ERPNext rather than other way around

* Don't need a huge comment block as of now

* Fetch Payment Entries against Purchase Invoices (BillPayment)

* Rename Quickbooks Connector to Migrator

* Make oauth settings configurable

* Make company configurable

* Make default accounts configurable

* Fetch accounts and other masters separately

* Show realtime progress

* Check if entries exist before attempting insert

* Suppress other annoying messages

* Tracebacks are good for health

* Don't want rounded total

* Don't call fetch after authorization (Need to somehow separate these)

* Make credit_to account payable

* When generating payment entry mention bank_account as well

* Cleanup

* Add custom buttons and reflect current state in form ui

* Show necessary fields on form depending on the current state

* Cleanup

* Minor fixes

* Set income and expense account on items.

* Set currency for Account.

* Stupid VSCode

* Remove redundant code

* Check for existing Payment and BillPayment correctly

* Cache API response for faster development

* Don't maintain stock for now, Seems to solve the issue with 'Stock Received but not billed'

* Cleanup

* Add methods to remove inserted data completely (Development)

* Don't commit in every iteration

* Set account head based on TaxRate in Sales Invoice

* Fetch and cache TaxCode

* Add methods to fetch TaxCode and TaxRate from cache

* Set item wise tax breakup, Don't use Actual Tax

* Use both TaxRateLists

* Set Itemwise tax on Purchase Invoice as well

* Set bank_amount, while creating payment entries

* Remove print statements

* Add Shipping in taxes child table of Sales Invoice

* Set posting date on Payment Entries against Invoices

* Fetch and save expenses as Journal Entries

* Fetch and save Deposits as Journal Entries

* Fetch and Save Credit and Debit Notes

* Fetch and save SalesReceipt

* Record Shipping as Item instead of Tax

* Minor Fixes

* Fetch Advance Payments

* Set account_type during Account creation

* Choose receivable account in Invoice based on currency

* Remove receivable_account field

* Account type is already set during account creation

* Set receivable account based on currency in Sales Receipt and Credit Memo

* Set receivable account on Customer

* Save Company Preferences

* Set shipping_account based on company preferences

* Set cost center in Sales Invoice Items and Taxes

* Make Account name unique in case of duplicate account name

* Fetch and Save TaxPayment as Journal Entry

* Record UndepositedFunds Account in cache if found

* Credit UndepositedFunds account when mentioned in Deposit

* Debit Cashback account as well if mentioned in Deposit

* Set currency conversion rate

* Set is_group field correctly for accounts

* Preserve account hierarchy

* Use quickbooks_id and company together for filtering

* Make new custom field 'company' on Supplier Customer and Item

* Use comapny field for filtering Customer, Item, Supplier

* Shipping Account is only available if shipping is enabled for comapny

* Invoice might not have TxnTaxDetail.TaxLine

* Lookup TaxRate account correctly

* TaxCode might not have SalesTaxRateList PurchaseTaxRateList or Both

* TaxCode might not have SalesTaxRateList and PurchaseTaxRateList

* Remove unnecessary UI elements

* Allow multiple companies to have customers with same name

* Refactor account_type

* Create a leaf an account for every group account

* Item and Tax list creation needs more information

* Supports discount in Invoice

* Save Invoice as Journal Entry when itemwise details are unavailable

* Credit=True represents a refund rather than charge

* Mode of Payment not synced, setting as Cash for now

* Tax code may also be set for an entire invoice

* Fetch General Ledger Report correctly

* Refactor fetching entries from General Ledger Report

* Tax Payment is the same as Sales Tax Payment and Purchase Tax Payment

* append_number_if_name_exists is stupid, Reimplementing

* Don't guess credit/debit for Tax Payment and Advanced Payment

* Bill Payment shouldn't assume full payment

* Save Payment as Journal Entry

* Make Client ID and Client Secret Default

* Remove unused python imports

* removed are_accounts_synced()

* Don't store translated values in database

* Endpoints as a field

* Major refactor - functions to methods

* Major Refactor Functions to Methods

* Major Refactor Fix Stuff

* Minor Changes

* Save Refund As well

* Minor Refactor (SI varations to SI, PI variations to PI)

* Record Inventory Qty Adjust Entries

* QBM Final Touches

* Make changes suggested in review
2018-10-17 17:50:00 +05:30
Nabin Hait
9fde97cdd2 Fixed merge conflict 2018-09-12 15:45:20 +05:30
Ameya Shenoy
8b7fea5a8a
Merge pull request #15349 from sagarvora/py3-fixes
[py3] print, StringIO import, and other fixes
2018-09-09 02:25:10 +05:30
Sagar Vora
538100148f [py3] print, StringIO import, and other fixes 2018-09-07 17:59:59 +05:30
Pawan Mehta
2cc7eb1e94 fix default settings (#15345) 2018-09-07 17:59:10 +05:30
Zarrar
7737620ff4 [Staging] Patch fix - Shopify Settings (#15338)
* keep enable_shopify in Shopify Settings disabled by default

* patch fix for shopify refactor

* minor fallback fix
2018-09-07 13:19:33 +05:30
ahmad zaqout
2350dc26f6 fix syntax error HTTPError in amazon_mws_api (#15324) 2018-09-06 13:21:04 +05:30
Pawan Mehta
6010a10ad1 Amazon MWS Connector (#15061)
* [fix] #15054

* [fix] #15058

* codacy issues

* Codacy fixes-1

* Travis Fix

* fix codacy

* fix codacy

* review changes 1

* Custom fields and fixes

* remove amazon id

* remove item.json and sales_order.json

* added back sales_order and item files
2018-09-05 17:16:57 +05:30
Aditya Hase
e3ac5ff9e3 erpnext: refactor async to is_async (#15231) 2018-08-28 14:11:58 +05:30
Faris Ansari
796ca56f85 Use frappe.utils.md_to_html instead of manual import (#15087) 2018-08-07 11:53:36 +05:30
Zarrar
89c87fd6a6 [Minor] Patch fix (#15041)
* update modified date

* remove extra parameter from function call
2018-07-30 10:57:47 +05:30
Saurabh
f86224e6f7
Merge pull request #14945 from chdecultot/gocardless_corrections
Gocardless improvement and  payment request correction
2018-07-26 11:41:43 +05:30
Charles-Henri Decultot
6321a6b908 use standard dict method 2018-07-23 08:56:38 +00:00
Charles-Henri Decultot
9d09343e57 Gocardless improvement and payment request correction 2018-07-17 16:15:30 +00:00
Charles-Henri Decultot
cde1f08af6 Review corrections 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
19a47c3e0a Codacy corrections 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
0134e13631 Subscription integration 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
ba6f6d976d Stripe integration corrections 2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
a45ea63b5d Codacy correction 2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
6c2ad66522 Codacy corrections 2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
a27673ecfe Travis correction 2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
79380c6a74 Travis correction 2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
30da37fbb8 Move Stripe to ERPNext 2018-07-13 13:05:54 +00:00
rohitwaghchaure
fb997d6539 [Fix] Woocommerce test cases (#14513) 2018-06-14 09:13:39 +05:30
Manas Solanki
176e7c5ce2 fix the test case for the payroll (#14480)
* fix the test case for the payroll

* fix the shopify and stock entry

* more structured test cases for payroll
2018-06-13 11:13:01 +05:30
Shreya
294238abfd Fix shopify test case 2018-06-11 10:31:39 +05:30
Saurabh
d60c0f2292 Refactor shopify (#13588)
* move shopify settings to ERPNext

* [fix] setup webhook for order and validate webhook request

* validate webhook request

* sync customer and item if not exists while syncing order from shopify

* pull item from shopify and minor fixes

* fix method naming, mechanisim to register and withdraw webhooks, patch

* minor fix

* minor fixes

* [Patch][fix] use remove_from_installed_apps instead of remove app

* log exceptions

* add shopify logging for failed requests

* minor fixes

* fix test case

* codecy fixes

* check shared secret exists

* Test Case fixes

* UX fixes and patch fixes

* Documentation

* fixes

* [fix] dump webhooks request data into doctype

* Provision to resync the order if error occured in sync

* [fix] set default host
2018-05-16 11:33:47 +05:30
Vinayak Jethe
df83148d7c Woocommerce Integration (#13217)
* WIP for WooCommerce Integration

* WIP for WooComm Integration

* WIP WooComm

* Added Woocommerce Settings

* Woocommerce Settings

Enable Sync Makes fields mandatory

* Woocommerce whitelisted endpoints

* [Clean Up] Woocommerce Settings

* Verify Webhook Data

* Fix Verify Webhook

* WIP WooComm

* WIP and working few modules

* Customer creating partially

* Customer creation successful

* Refactored Customer code

* WIP Address

* Fixed address and customer bug. Now working fine

* WIP for products. Creation of items successful

* Handling json for product

* Products creating and updating properly

* Custom checkbox for required doctypes

* Product feature fully completed

* WIP orders

* Sales order working properly

* Orders mapping successfully

* New version Customer Working Properly

* Items creation properly

* Working on sales order

* Orders comming successfully

* Bug fixes

* Fixed date format for delivery date

* Code Cleanup

* Woo setting page modified

* Fixed minor bug

* Fixes

* Minimum Viable Product

* Cleanup

* Removed duplicate file from erpnext config

* Added more default changes to woo settings

* Fixes as per required

* Fixes

* Bug fix

* few changes and fix

* Fixing

* Fixes with test

* Added Test for Woocommerce - Emulates request

* Fix woocommerce test

* fix woocommerce test

* verify_request: py3 ready

* Codacy fixes

* WooCommerce Integration Docs

* Codacy changes

* Codacy fixes

* User set tax account

* Fixes for account

* Fix for warehouse issue

* Docs updated

* Codacy fix

* Updated Docs

* Minor changes

* Tested added for repeat order and cleanup

* Minor change

* docs and gifs renamed according to convention

* Doc updated
2018-04-03 11:17:03 +05:30
Charles-Henri Decultot
bc7a549fdb Gocardless integration (#13008)
* GoCardless integration

* Addition of a method for determining if the email should be sent or not

* Correction for Tests

* Codacy fix

* Documents moved to ERPNext

* Codacy fix

* Codacy fixes

* Remove method where not necessary and replace with hasattr
2018-03-01 10:59:21 +05:30
Faris Ansari
3a5dceae18 Add Github Connector (#11259)
- Add new module ERPNext Integrations
2017-11-13 19:19:13 +05:30