Commit Graph

70 Commits

Author SHA1 Message Date
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