Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,840 Commits 3 Branches 0 Tags
Commit Graph

4623 Commits

Author SHA1 Message Date
Aditya Hase
3b75551739 feat(dashboard): Render Account Balance Timeline is a time series 2019-03-12 14:47:21 +05:30
Aditya Hase
59fc039c77 style: Linting fixes 2019-03-12 14:47:21 +05:30
Aditya Hase
1e0f9a2882 feat(dashboard): Use caching decorator for dashboard 2019-03-12 14:47:21 +05:30
Aditya Hase
76158e6643 feat(dashboard): Export chart source doc to JSON file 2019-03-12 14:47:21 +05:30
Aditya Hase
675c1d3a5a refactor(dashboard): Move Soure settings to account_balance_timeline.js 2019-03-12 14:47:20 +05:30
Aditya Hase
09f2ed2e69 refactor(dashboard): Move dashboard.py to account_balance_timeline.py 2019-03-12 14:47:20 +05:30
Aditya Hase
d85b0ae602 fix(dashboard): Remove unused variables 2019-03-12 14:47:20 +05:30
Aditya Hase
2fa1d9caed fix(dashboard): Remove print statement 2019-03-12 14:47:20 +05:30
Aditya Hase
15c0cfff0f refactor(dashboard): Convert indentation to tabs 2019-03-12 14:47:20 +05:30
Aditya Hase
4b171ddebb feat(dashboard): Remove hardcoded company filter 2019-03-12 14:47:20 +05:30
Aditya Hase
3b593e44c6 feat(dashboard): Set account from filters 2019-03-12 14:47:20 +05:30
Aditya Hase
5911e100ad fix(dashboard): Consider opening balance 2019-03-12 14:47:20 +05:30
Aditya Hase
6cadf77073 feat(dashboard): Add Time Grain filter 2019-03-12 14:47:20 +05:30
Aditya Hase
c888e52788 feat(dashboard): Add missing dates 2019-03-12 14:47:20 +05:30
Aditya Hase
8896374413 feat(dashboard): Add timespan filter 2019-03-12 14:47:20 +05:30
Aditya Hase
953229fa47 feat(dashboard): Create Accounting dashboard from General Ledger Report 2019-03-12 14:47:20 +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
Deepesh Garg
40743840b7 fix: Print letter head only if checked in Print Settings (#16789) 
Letter head is printed in financial statements even if option is not checked

![letter head option](https://user-images.githubusercontent.com/42651287/53430759-26baa080-3a15-11e9-948a-bc95700a18d2.png)
 2019-03-04 12:53:11 +05:30
Anurag Mishra
1e4e61bd94 Minor fixes 2019-03-04 12:36:51 +05:30
Anurag Mishra
f3bdeedc68 minor fixes 2019-03-04 12:27:41 +05:30
Mangesh-Khairnar
4f350fcadb feat: validate sales order in sales invoice 2019-03-02 20:48:04 +05:30
Jay Parikh
c2090939d7 Fix Sales Invoice Return Validation "validate_pos" 2019-03-02 12:19:32 +00:00
Frappe Bot
8f0660ab31 Merge branch 'master' into develop 2019-03-01 09:22:36 +00:00
rohitwaghchaure
066da6b1b6
Merge pull request #16817 from gaurav-naik/italy-einvoice-bank-details-fix 
fix(regional,italy): bank details, custom button on sales invoice
 2019-03-01 14:26:07 +05:30
Gaurav
b30a9b1869 fix(regional,italy): bank details, custom button on sales invoice 
Updates to Bank details in e-invoice XML
Additional fields on Payment Schedule
Button to Generate E-Invoice on Sales Invoice (generates and replaces attached e-invoice)
Replaced `x.decode('utf-8')` with `frappe.safe_decode(x, encoding='utf-8')` in setup.py
Updated italian localisation patch line in patches.txt
 2019-03-01 12:38:35 +05:30
FinByz Tech Pvt. Ltd
6635583103
fix: Rounding adjustment in Rounded Total 
In Purchase Receipt and GST Purchase Receipt report, the Rounded Total column doesn't display rounding adjustment of Base Grand Total. So, we have created a fix for that rounding adjustment.
 2019-03-01 11:57:06 +05:30
Rohit Waghchaure
c21cda2790 Removed validation for group by voucher in general ledger 2019-02-28 16:20:45 +05:30
Frappe Bot
1fcae10258 Merge branch 'master' into develop 2019-02-28 10:20:48 +00:00
Anurag Mishra
a9a1552e32 refactor 2019-02-27 14:10:24 +05:30
Rushabh Mehta
76f36f68d3
Merge pull request #16790 from crossxcell99/master 
fix: call base class onload method
 2019-02-27 08:31:14 +05:30
crossxcell99
f95171e808 fix: call base clase onload method 2019-02-26 18:01:37 +01:00
Sagar Vora
e0eafb1c2c Merge branch 'master' into develop 2019-02-26 17:08:59 +05:30
Suraj Shetty
5636f924a9 fix: get mode of payment while selecting payment term in payment term template (#16765) 2019-02-25 12:43:34 +05:30
Saurabh
3dd7ddd838 Merge branch 'master' into develop 2019-02-21 18:25:29 +05:30
Saurabh
47738f9792
Merge pull request #16750 from nabinhait/cc-against-bs 
fix: Ignore cost center while fetching outstanding invoices if not allowed from accounts settings
 2019-02-21 18:12:06 +05:30
Nabin Hait
e08cb3a49b
Merge pull request #16745 from nabinhait/manage-returned-qty 
fix: Consider returned qty while making invoice from DN / PR
 2019-02-21 18:11:37 +05:30
Saurabh
a05ccb76f4
Merge pull request #16748 from nabinhait/multi-company-serial-invoicing 
fix: Validate serial no usage in invoice considering multi company transaction
 2019-02-21 18:07:40 +05:30
Nabin Hait
e797ec7463
Merge pull request #16746 from deepeshgarg007/gross_profit 
fix: Decimal point issue in gross profit print
 2019-02-21 18:07:14 +05:30