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

1068 Commits

Author SHA1 Message Date
Deepesh Garg
dfd82d22c8
Merge pull request #19792 from nabinhait/ar-summary-based-on-terms 
feat: Receivable / payable summary based on payment terms
 2019-12-04 11:25:28 +05:30
Nabin Hait
e176c3c1d1 feat: Receivable / payable summary based on payment terms 2019-12-03 16:56:48 +05:30
Deepesh Garg
8d31171ff8 fix: Party name field in trial balacne for party report (#19789) 2019-12-03 16:31:07 +05:30
Deepesh Garg
03d1394540 fix: Unable to see parties with negative balance in AR/AP Summary (#19776) 2019-12-03 15:12:44 +05:30
Deepesh Garg
06a6fa4cfc feat: Accounts Payable report based on payment terms (#19672) 2019-11-29 16:56:27 +05:30
Nabin Hait
732d6afad5
fix: Show AR summary based on outstanding (#19573) 2019-11-13 18:49:23 +05:30
Nabin Hait
3a72cb46bc
fix: Set due date in accounts receivable based on payment terms (#19563) 2019-11-13 17:58:10 +05:30
Deepesh Garg
082bfb8cb3
Merge pull request #19567 from deepeshgarg007/balance_sheet_develop 
fix: Accumulated Values filter disappearing
 2019-11-13 17:46:46 +05:30
deepeshgarg007
5ea4328359 fix: Accumulated Values filter disappearing 2019-11-13 13:23:49 +05:30
Nabin Hait
8bd2d4d35e
fix(trial balance): Show opening and closing of group account in single column (#19509) 2019-11-11 10:59:20 +05:30
rohitwaghchaure
6a50c92087
Update accounts_receivable.js 2019-11-06 16:34:17 +05:30
Rohit Waghchaure
dec5bead9c fix: unknown column credit limit in accounts receivable report 2019-11-06 13:13:31 +05:30
Jai Chavan
9f483c1fa9
fix: Spelling of Variance 2019-10-26 18:45:01 +05:30
Sahil Khan
c5a6e9da15 Merge branch 'develop' into version-12 2019-10-02 16:36:54 +05:30
Deepesh Garg
b54f0fb388 fix: Party column empty in accounts receivable/ payable summary (#19205) 2019-09-30 15:19:56 +05:30
sahil28297
a9ff4f6688
fix(Report): Sales Register 2019-09-26 13:58:00 +05:30
Rucha Mahabal
132323462c fix(Report): Sales Register (#19166) 2019-09-25 16:03:45 +05:30
Nabin Hait
2064dfc5a9
fix: Handling payments against credit/debit notes and party currency (#19154) 2019-09-24 19:52:33 +05:30
Mangesh-Khairnar
1e6e1dd451 enhancement(tds-monthly-payable): remove zero value transaction (#19141) 2019-09-24 19:46:06 +05:30
Mangesh-Khairnar
5dcf2c669f chore: remove unlinked letter head references (#19138) 2019-09-24 09:53:06 +05:30
Anurag Mishra
2c60f6419e feat: missmatching amount in GST Sales report and itemised sales report (#19116) 2019-09-20 23:00:09 +05:30
rohitwaghchaure
30f3354a7a
Merge pull request #19114 from marination/report-fix 
fix: Report 'Payment Period based On Invoice Date'
 2019-09-19 19:01:05 +05:30
marination
8590112faa fix: Report 'Payment Period based On Invoice Date' 2019-09-19 17:48:23 +05:30
rohitwaghchaure
d019d28bc9 fix: Customer Ledger Summary report not working on python 3 (#19092) 2019-09-17 18:45:59 +05:30
Nabin Hait
1d1858a8b0
Show draft future payments as well 2019-09-11 18:39:49 +05:30
Nabin Hait
b5bd91417d
fix: Print/PDF of AR/AP report after refactoring (#18931) 2019-09-05 16:43:20 +05:30
Nabin Hait
561a2e966e
Update accounts_receivable.py 2019-09-04 11:02:48 +05:30
Nabin Hait
1ab75db0ac
refactor: Accounts Receivable / Payable report (#18906) 2019-09-03 16:07:46 +05:30
Nabin Hait
d8c262fd5c
fix: Translations of strings (#18825) 2019-08-23 16:32:58 +05:30
Nabin Hait
bcb0f6038e
fix: Single gl entry should only be considered once either in opening or closing entry (#18792) 2019-08-21 14:47:33 +05:30
rohitwaghchaure
16dda1a991 fix: group by voucher consolidated showing incorrect data for deferred entries (#18779) 2019-08-20 12:37:32 +05:30
Anurag Mishra
bc5712a1b3 fix: validated cost center in financial_statement (#18733) 
* fix: validated cost center in financial_statement

* Update financial_statements.py
 2019-08-19 10:24:44 +05:30
Rohit Waghchaure
c5d41af10f fix: sequence of customer name and contact in the AR report 2019-08-14 18:49:19 +05:30
deepeshgarg007
4c652396d0 fix: Opening balance not getting calculated in trail_balance_report 2019-07-29 14:57:33 +05:30
deepeshgarg007
6dd5f74671 fix: Remove dimensions from boot 2019-07-26 09:14:42 +05:30
deepeshgarg007
ada1ac8013 fix: Added default dimension and filter in bootinfo 2019-07-26 09:14:42 +05:30
deepeshgarg007
f56284b0c1 Dynamic link issue fix in Bank reconciliation statement 2019-07-25 12:47:32 +05:30
Mangesh-Khairnar
0bbfca8142 fix: payment document link fix (#18301) 2019-07-22 11:49:18 +05:30
Saurabh
90d7a8888f fix: pass missing argument while generating consolidated financial statement for cash flow type (#18398) 2019-07-22 11:22:34 +05:30
Deepesh Garg
8fcd426dab
Merge pull request #18350 from rohitwaghchaure/added_payment_terms_in_accounts_payble_summary_develop 
feat: added payment terms filter in the accounts payable summary
 2019-07-16 08:39:30 +05:30
Rohit Waghchaure
4c0dffe687 feat: added payment terms filter in the accounts payable summary 2019-07-16 02:00:41 +05:30
rohitwaghchaure
3643d67249
Merge pull request #18023 from fproldan/fix_by_voucher_order_develop 
fix: General Ledger Group by Voucher not ordering by posting_date for develop
 2019-07-14 17:23:54 +05:30
Deepesh Garg
91417646b1
Fix: Add fieldtype as currency 2019-07-12 12:24:05 +05:30
Shivam Mishra
020f405367
Merge branch 'develop' into cash-flow-chart 2019-07-11 10:12:45 +05:30
deepeshgarg007
285701d9f1 fix: Add missing Cost Center filter in cash flow statement 2019-07-10 22:22:14 +05:30
Shivam Mishra
f2f1e81a3f feat: added chart to cash-flow report 2019-07-10 20:28:52 +05:30
Don-Leopardo
365a572073
Merge branch 'develop' into fix_by_voucher_order_develop 2019-07-10 10:52:59 -03:00
Suraj Shetty
61d8088be4 fix: Return fieldtype so that the client-side can format chart values (#18211) 2019-07-10 17:05:25 +05:30
deepeshgarg007
6bb5ade667 fix: Add accounting dimensions to various reports and fixes 2019-07-07 21:24:45 +05:30
Deepesh Garg
a37c51f93e
Merge pull request #18149 from deepeshgarg007/trial_balance_dimensions 
fix: Add filters for accounting dimensions in trial balance report
 2019-07-03 22:00:25 +05:30
Shivam Mishra
bb02c5105e fix: format values for charts 2019-07-03 19:22:21 +05:30
deepeshgarg007
58b4644c1a fix: Add filtesr for accounting dimensions in trial balance report 2019-07-03 18:08:41 +05:30
Don-Leopardo
85e2fd965a
Merge branch 'develop' into fix_by_voucher_order_develop 2019-07-03 08:15:08 -03:00
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
Don-Leopardo
46b21f88e1
Merge branch 'develop' into fix_by_voucher_order_develop 2019-07-02 14:03:45 -03:00
Rohit Waghchaure
2fa6224f8f fix: accounts receivable / payable not working if the company is not seletced in filter 2019-07-01 11:55:12 +05:30
rohitwaghchaure
4c2eb0f13b
Merge pull request #17981 from rohitwaghchaure/added_include_default_finance_book_in_reports_develop 
fix: finance book filters includes the gl data which don't have finance book
 2019-06-29 15:06:34 +05:30
Don-Leopardo
c3f6bed650
Merge branch 'develop' into fix_by_voucher_order_develop 2019-06-27 18:09:19 -03:00
Nabin Hait
40d25f4010
fix: Show close button if per_ordered is less than 99.999999 (#18067) 2019-06-26 10:57:45 +05:30
NahuelOperto
4448e2d66b fix order in general ledger 2019-06-21 08:50:37 -03:00
Faris Ansari
2632107129
fix: User MultiSelectList control for Party filter (#17943) 
* fix: User MultiSelectList control for Party filter

The comma based filter wouldn't work for values that had comma in them

* fix: Replace with MultiSelectList in reports

* fix: Parse json instead of string split
 2019-06-19 12:15:37 +05:30
Rohit Waghchaure
5f9793e081 fix: finance book filters includes the gl data which don't have finance book 2019-06-18 21:09:52 +05:30
Rohit Waghchaure
b821af44b6 fix: revert group by voucher general ledger changes 2019-06-17 07:42:53 +05:30
rohitwaghchaure
a030138df8 fix: trial balance opening balance not showing in the debit side for the liability account (#17944) 2019-06-14 11:57:14 +05:30
Anurag Mishra
122cdaf87b fix: column width (#17935) 2019-06-14 11:29:18 +05:30
Anurag Mishra
ff99cea1c4
Merge branch 'develop' into report_trial_balance_fix 2019-06-11 14:17:54 +05:30
rohitwaghchaure
ba715feb7f
Merge pull request #17899 from rohitwaghchaure/general_ledger_group_by_voucher_consolidated_issue_develop 
fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated)
 2019-06-11 11:39:48 +05:30
Anurag Mishra
0ef811d92d
Merge branch 'develop' into report_trial_balance_fix 2019-06-11 11:14:02 +05:30
Anurag Mishra
acae7a903b fix: requested changes 2019-06-11 11:12:28 +05:30
Rohit Waghchaure
ef5dd87928 fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated) 2019-06-10 18:34:18 +05:30
Rohit Waghchaure
5f41a3333b fix: accounts receivable for PDC not showing 120 days column 2019-06-10 18:15:43 +05:30
Anurag Mishra
fd19678bc7 fix: show cost center in print fromat of report trial balance 2019-06-06 18:37:10 +05:30
Prasann Shah
829172c267 [Add] GSTIN filters in hsn wise summary and itemised reports 2019-06-06 12:08:09 +05:30
Nabin Hait
68eaaa068b
fix: Removed unwanted total row from financial statement and general ledger print (#17860) 2019-06-05 20:29:24 +05:30
Rohit Waghchaure
8309582cca fix: report Payment Period Based On Invoice Date not working 2019-06-03 18:23:54 +05:30
deepeshgarg007
55b894bfef Merge branch develop into dimensions 2019-06-01 23:13:36 +05:30
deepeshgarg007
480586152b fix: Label translations 2019-05-30 22:34:00 +05:30
deepeshgarg007
da2e456f70 fix: Add translations for missing labels in AR report 2019-05-30 22:30:32 +05:30
deepeshgarg007
a8cb00f31f fix: Styling and test case fixes 2019-05-28 16:03:08 +05:30
deepeshgarg007
adccb2c3a4 fix: Remove print statements 2019-05-28 12:24:28 +05:30
deepeshgarg007
f5b6ee9ae7 fix: Multiple fixes in accounting doctype 2019-05-28 12:15:56 +05:30
deepeshgarg007
d330519f7c fix: Merge branch develop into dimensions 2019-05-25 18:18:08 +05:30
rohitwaghchaure
0c2e3c77a3 fix: range 4 for ageing filter added in the AP/AR report (#17715) 2019-05-23 15:27:47 +05:30
Deepesh Garg
9982576ea6
Merge pull request #17678 from rohitwaghchaure/show_opening_entries_gl_report_v12 
feat: added checkbox in the filter of general ledger to show opening entries
 2019-05-20 15:20:53 +05:30
Rohit Waghchaure
97d2a46052 feat: added checkbox in the filter of general ledger to show opening entries 2019-05-20 12:28:57 +05:30
deepeshgarg007
a4c9134d33 fix: Inactive Sales Item report fixes 2019-05-17 16:19:15 +05:30
Nabin Hait
6b9d64ce1d
refator: Payroll processing and tax calculation (#17617) 
* refactor: Payroll processing and tax calculation

* fix: payroll test cases

* fix: Codacy fixes

* fix: payroll test cases

* fix: removed unwanted code
 2019-05-16 11:23:04 +05:30
deepeshgarg007
60f4dd0736 Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions 2019-05-14 15:51:12 +05:30
deepeshgarg007
d9a22726f1 fix: Make territory filter mandatory 2019-05-14 14:36:40 +05:30
deepeshgarg007
4dcba49b5f fix: Do not append row if item is sold within days since last order 2019-05-14 08:53:24 +05:30
deepeshgarg007
e64c357216 fix: Commified function to get dimensions 2019-05-14 08:50:45 +05:30
deepeshgarg007
0c874d915b fix: Indentation fixes 2019-05-12 18:38:57 +05:30
deepeshgarg007
7c12cfcb63 fix: Show all territories and items in inactive sales item report 2019-05-12 18:38:49 +05:30
deepeshgarg007
d83cf65be1 fix: Added dimensions in financial reports and general ledger 2019-05-12 18:34:23 +05:30
Rohit Waghchaure
7bee502d72 fix: get totals of gross profit amount on call of the method get_invoiced_item_gross_margin 2019-05-08 15:38:34 +05:30
Rohit Waghchaure
1d6f2c3b5d feat: Get invoiced item's gross margin using API 2019-05-08 15:38:05 +05:30
deepeshgarg007
6c6b24011f Merge branch 'develop' of https://github.com/frappe/erpnext into inactive-items-fix-develop 2019-05-02 23:03:59 +05:30
Rushabh Mehta
27a30c842d fix: simplify sort condition 2019-05-02 09:23:56 +05:30
Nabin Hait
7ca243094e
Merge branch 'develop' into coa-sorting 2019-05-02 00:58:56 +05:30
deepeshgarg007
db999e293b fix: Rename Inactive Items report to Inactive Sales Item 2019-05-01 14:06:06 +05:30
Rushabh Mehta
43958dcd11 fix(minor): chart of accounts sorting and message 2019-05-01 13:53:05 +05:30
Rohit Waghchaure
c181064782 fix: Trial balance finance book issue 2019-04-25 17:51:09 +05:30
Nabin Hait
8624957cbc
Merge pull request #17291 from prasadarr/listing-fixes 
fix: Allow system manager to access share ledger
 2019-04-22 15:35:35 +05:30
Nabin Hait
d21bacfc21 fix: Total row alignment in AR report 2019-04-20 10:58:58 +05:30
Prasad R
e1a6022c8c fix: Allow system manager to access share ledger 2019-04-19 10:57:21 +05:30
Rohit Waghchaure
376db4f6b7 fix: credit amount in account's currency not be consider if debit amount is present in the general ledger 2019-04-18 22:06:22 +05:30
Rohit Waghchaure
7aee809571 fix: If finance book filter is not set then show all the entries 2019-04-16 19:35:18 +05:30
Nabin Hait
89206e74d0 fixed merge conflict 2019-04-11 12:31:14 +05:30
Mangesh-Khairnar
1934a76cd8 feat: Add status field in multiple reports linked with purchase order and sales order creation (#17107) 
* enhancement: add status field in ordered itemd to be delivered

* enhancement: add status field in purchase order itemd to be received

* enhancement: add a status column in the billed reports
 2019-04-08 16:29:59 +05:30
Nabin Hait
e0a9835f30
Merge pull request #16987 from SaiFi0102/Party-Ledger-Summary-Fix 
fix(Party Ledger Summary): Show all adjustment entries as columns
 2019-04-04 11:45:36 +05:30
Nabin Hait
9ee417888e
Merge pull request #17092 from nabinhait/ar-ap-print 
fix: Show Sales Person in AR/AP print is optional
 2019-04-04 11:02:26 +05:30
deepeshgarg007
5ad7b655cf fix: Divide by zero exception handling 2019-04-03 09:11:03 +05:30
Nabin Hait
51d08786dc fix: Show Sales Person in AR/AP print is optional 2019-04-01 16:24:23 +05:30
deepeshgarg007
4092ead41e fix: fetch account only if available 2019-03-29 16:19:04 +05:30
Nabin Hait
d4e038b6ca Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop 2019-03-29 12:41:48 +05:30
Rohit Waghchaure
9da14747aa fix: accounts receivable summary 2019-03-29 09:26:40 +05:30
Saurabh
84a18f5b18 Merge branch 'master' into develop 2019-03-28 13:54:34 +05:30
Faris Ansari
843b7f6dd5 fix: Reorder Currency column to fix print (#17008) 
Every Financial Report's 2nd column is Currency, which is an implicit requirement to Print them properly. In this case, Income column was not printed. This fixes that.
 2019-03-25 15:50:36 +05:30
Rohit Waghchaure
4ed7d035cb fix: incorrect paid amount in accounts receivable summary report 2019-03-25 15:37:25 +05:30
Frappe Bot
b07a5d449d Merge branch 'master' into develop 2019-03-23 07:25:03 +00:00
Saif Ur Rehman
7d1c1aa28f fix(Party Ledger Summary): Show all adjustment entries as columns 
Consider only Income Account or Expense Account account type for adjustment amounts
Check if GL Entry's is_opening == "Yes"
 2019-03-22 17:18:32 +05:00
Rushabh Mehta
da87a491ab
Merge pull request #16816 from finbyz/hotfix 
fix: Rounding adjustment in Rounded Total
 2019-03-22 12:51:09 +05:30
Saurabh
3c95387926 Merge branch 'master' into develop 2019-03-20 14:39:49 +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
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
Himanshu Warekar
642a5b69f5 fix: change customer to supplier 2019-03-18 21:53:33 +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
ace95d5a67 feat: added cost center filter in AR/AP reports 2019-03-18 12:21:00 +05:30
Deepesh Garg
2ae7ed4cf0
fix: Gross profit report fix (#16935) 2019-03-17 09:49:24 +05:30
Frappe Bot
7e67a400cd Merge branch 'master' into develop 2019-03-08 09:39:33 +00:00
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
02138b6bfc fix: gross depends upon now report type 2019-03-04 14:46:28 +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
f3bdeedc68 minor fixes 2019-03-04 12:27:41 +05:30
Frappe Bot
8f0660ab31 Merge branch 'master' into develop 2019-03-01 09:22:36 +00:00
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
Anurag Mishra
a9a1552e32 refactor 2019-02-27 14:10:24 +05:30
Saurabh
3dd7ddd838 Merge branch 'master' into develop 2019-02-21 18:25:29 +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
Rohit Waghchaure
90691dc0d8 (Profit and Loss Statement, fix): for parent account value was showing as zero 2019-02-21 17:18:28 +05:30
deepeshgarg007
14ff6bfc32 fix: Decimal point issue in gross profit print 2019-02-21 12:08:32 +05:30
Sagar Vora
cc6e51c62d Merge branch 'master' into develop 2019-02-19 18:09:49 +05:30
Nabin Hait
e4f73929c4 fix: AR/AP report based on account type 2019-02-19 17:11:50 +05:30
Anurag Mishra
61f981ae05 Changes Requested 2019-02-18 11:43:32 +05:30
Frappe Bot
74fd5daeb2 Merge branch 'master' into develop 2019-02-15 10:22:33 +00:00
Nabin Hait
1c6a1dd5c0
Merge branch 'hotfix' into general-ledger-fix 2019-02-14 18:37:40 +05:30
Anurag Mishra
4f0fd38209 refractor 2019-02-13 16:46:05 +05:30