Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,684 Commits 3 Branches 0 Tags 1 GiB
4792a84b5f
Commit Graph

4393 Commits

Author SHA1 Message Date
Rohit Waghchaure
4792a84b5f fix: rename pricing rule child doctype names 2019-03-25 14:28:08 +05:30
Frappe Bot
b07a5d449d Merge branch 'master' into develop 2019-03-23 07:25:03 +00:00
Zarrar
963d62b701 feat: Chart of Accounts Importer (#16623) 
* bare doctype created for COA utility

* improvise doctype's design

* validation to check no transaction exist for the company

* download file and import coa - client side logic added

* download csv template to create custom chart

* read the custom csv uploaded and parse it to appropriate format

* convert list of list to nested tree structure

* preview the uploaded chart before actual import

* toggle field based on necessity

* tweak create_charts and build_json logic to incorporate COA Import utility

* code cleanify and validation call added

* code enhancement for flexibility and validation added

* show import button only if data is validated

* unset existing data and load new accounts

* disable coa fields if parent_company set, minor improv

* file api fix

* added progress bar

* codacy fixes

* fix: Add account number in template

* fix: TDS account exception handling fix
 2019-03-23 10:30:12 +05:30
rohitwaghchaure
56e491bccd
Merge pull request #16983 from rohitwaghchaure/allow_on_submit_for_budget_fields 
feat: enabled allow on submit for action fields in the Budget
 2019-03-22 15:34:41 +05:30
Rushabh Mehta
da87a491ab
Merge pull request #16816 from finbyz/hotfix 
fix: Rounding adjustment in Rounded Total
 2019-03-22 12:51:09 +05:30
Rushabh Mehta
7678c7b179
Merge pull request #16869 from rohitwaghchaure/not_able_to_submit_purchase_receipt 
fix: purchase receipt not able to submit because default inventory account has not selected in another company
 2019-03-22 12:47:06 +05:30
Rushabh Mehta
9c43c8f00b
Merge pull request #16554 from SaiFi0102/Brand-Item-Defaults-V12 
feat: Brand Item Defaults (v12)
 2019-03-22 12:46:04 +05:30
Rushabh Mehta
7defd6f3b5
Merge pull request #16749 from Alchez/hotfix-cancelled-payments 
fix(payments): Only check for Draft or Submitted payments while cancelling payment requests
 2019-03-22 12:43:52 +05:30
Rohit Waghchaure
9c214b6129 feat: enabled allow on submit for action fields in the Budget 2019-03-22 12:08:09 +05:30
Saurabh
3c95387926 Merge branch 'master' into develop 2019-03-20 14:39:49 +05:30
rohitwaghchaure
f45db71ba2
Merge pull request #16964 from rohitwaghchaure/fix_cost_center_mapping_not_working 
fix: Cost center from PO to PI is not mapping
 2019-03-20 13:40:05 +05:30
Rohit Waghchaure
f288866130 fix: Cost center from PO to PI is not mapping 2019-03-20 13:34:28 +05:30
Rohit Waghchaure
a322687897 fix: Accounts receivable report, remarks showing in the sales person column 2019-03-19 18:10:08 +05:30
rohitwaghchaure
40046721b2
Merge pull request #16954 from rohitwaghchaure/pos_cost_center_not_added_against_debtors 
fix: POS, cost center not added against debtors
 2019-03-19 16:38:07 +05:30
Rohit Waghchaure
8808a3fc8e fix: POS, cost center not added against debtors 2019-03-19 15:32:05 +05:30
rohitwaghchaure
4904ce649e
Merge pull request #16952 from rohitwaghchaure/fixed_accounts_receivable_summary_advance_amt 
fix: advance amount is not calculating properly
 2019-03-19 15:26:41 +05:30
Rohit Waghchaure
1a6e01542a fix: advance amount is not calculating properly 2019-03-19 15:06:01 +05:30
Rohit Waghchaure
8bfe330b37 feat: pricing rule enhancements 2019-03-19 12:44:30 +05:30
Himanshu Warekar
642a5b69f5 fix: change customer to supplier 2019-03-18 21:53:33 +05:30
rohitwaghchaure
2046024de9
Merge pull request #16942 from hrwX/invoice-creation-tool 
fix(Invoice Creation Tool): Disable P/L validation for opening invoice creation
 2019-03-18 15:48:55 +05:30
Himanshu
ac199580af fix(Customer Ledger): ambiguous error in where clause (#16914) 
fix for error "InternalError: (1052, u"Column 'company' in where clause is ambiguous")" in Customer Ledger Summary
 2019-03-18 15:44:54 +05:30
Rohit Waghchaure
d4e4316d0b fix: test cases and codacy 2019-03-18 14:18:49 +05:30
Zlash65
01086ff60c codacy fixes 2019-03-18 12:50:29 +05:30
Zlash65
11bba571af test case added to check account syncing 2019-03-18 12:50:29 +05:30
Zlash65
f71cb8dc6d fix: return if no descendants found 2019-03-18 12:50:28 +05:30
Zlash65
d787ef8b8e feat: sync account created for a group company to all its descendants 2019-03-18 12:50:28 +05:30
Zlash65
88c990901d fix: added validation to if account is being added to child company 2019-03-18 12:50:28 +05:30
Zlash65
0407bf1e00 fix: override primary action button, change filter to root company 2019-03-18 12:50:27 +05:30
Zlash65
2def228da8 feat: allow adding account only if topmost parent company 
- hidden filter for Parent Company added
- Add button overriden with new condition
 2019-03-18 12:50:27 +05:30
Himanshu Warekar
aa03ea2a56 disbale pl check for Sales and Purchase Invoice 2019-03-18 12:36:42 +05:30
Rohit Waghchaure
ace95d5a67 feat: added cost center filter in AR/AP reports 2019-03-18 12:21:00 +05:30
Deepesh Garg
3ead70ba3c
fix: Change IBAN Account length from 25 to 30 (#16847) 2019-03-18 08:22:57 +05:30
Deepesh Garg
2ae7ed4cf0
fix: Gross profit report fix (#16935) 2019-03-17 09:49:24 +05:30
rohitwaghchaure
fd33c55760
Merge pull request #16865 from rohitwaghchaure/purchase_invoice_asset_issue_not_able_to_submit 
feat: added provision to disable CWIP accounting in asset settings
 2019-03-16 12:18:36 +05:30
Rushabh Mehta
349a1157ef
Merge pull request #16717 from jigartarpara/fix_payment_term_template 
fix: Add credit month in validation
 2019-03-15 09:03:54 +05:30
Rushabh Mehta
59a3012a5c
Update payment_request.py 2019-03-15 08:57:49 +05:30
Bassam Ramadan
e14758c897 fix: add returns field to cashier closing (#16911) 2019-03-14 15:01:50 +05:30
Frappe Bot
7e67a400cd Merge branch 'master' into develop 2019-03-08 09:39:33 +00:00
Rohit Waghchaure
6b33c9b934 fix: purchase receipt not able to submit because default inventory account has not selected in another company 2019-03-08 11:13:35 +05:30
Rohit Waghchaure
821a002125 feat: added provision to disable CWIP accounting in asset settings 2019-03-08 10:51:37 +05:30
Saif Ur Rehman
e62bd893c5 Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12 
# Conflicts:
#	erpnext/stock/doctype/item/test_item.py
 2019-03-08 01:29:39 +05:00
Rohit Waghchaure
db8500c03a POS profile, account for change amount must be cash or bank account 2019-03-06 18:28:45 +05:30
Rushabh Mehta
1f0792d5ea
Merge pull request #16823 from jay-parikh/sales-return 
fix: Python 3 Sales Invoice Return Validation "validate_pos"
 2019-03-05 08:05:00 +05:30
rohitwaghchaure
369d20ac2b
Merge pull request #16829 from rohitwaghchaure/gst_purchase_invoice_hsn_number 
fix: HSN code not disaplying for the GST Purchase Invoice print format
 2019-03-04 16:58:58 +05:30
rohitwaghchaure
e552170ce6
Merge pull request #16704 from Anurag810/vedmata-print-formats 
feat: Auditors print formats
 2019-03-04 16:58:31 +05:30
rohitwaghchaure
8c96e06e19
Merge pull request #16629 from Anurag810/gross-and-net-profit-report 
feat: Gross and Net Profit Report
 2019-03-04 16:57:21 +05:30
Anurag Mishra
0c9945e0bf Minor fixes 2019-03-04 16:14:53 +05:30
Anurag Mishra
02138b6bfc fix: gross depends upon now report type 2019-03-04 14:46:28 +05:30
Rohit Waghchaure
9842ce5a79 fix: HSN code not disaplying for the GST Purchase Invoice print format 2019-03-04 13:39:52 +05:30
Deepesh Garg
44ff41188d fix: Selling and buying amount precision fix (#16764) 2019-03-04 12:56:27 +05:30