Commit Graph

147 Commits

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