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

932 Commits

Author SHA1 Message Date
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
Sagar Vora
551f52fd25 Merge branch 'master' into develop 2019-02-12 16:41:24 +05:30
Nabin Hait
6447069e50 fix: show values in account/party currency based in actual entry, no conversion 2019-02-12 16:41:20 +05:30
Nabin Hait
ab50211e18 fix: show project even if PI is directly created 2019-02-11 18:25:18 +05:30
Anurag Mishra
aaa57026ac Merge branch 'gross-and-net-profit-report' of https://github.com/Anurag810/erpnext into gross-and-net-profit-report 2019-02-11 17:02:59 +05:30
Anurag Mishra
f70d4089bc fix: codacy 2019-02-11 17:02:20 +05:30
Sagar Vora
4e92414850
Merge branch 'hotfix' into gross-and-net-profit-report 2019-02-11 16:00:28 +05:30
Anurag Mishra
a032f0528e new report gross-and-net-profit-report 2019-02-11 13:12:44 +05:30
Aditya Hase
2a3c39f38a fix(py3): Convert dict.values() to list for indexing 2019-02-08 12:02:57 +05:30
Aditya Hase
a86a569787 fix(py3): Convert dict.values() to list for indexing 2019-02-07 22:21:06 +05:30
Sagar Vora
f97c5dad82 Merge branch 'staging' into develop 2019-01-29 18:39:14 +05:30
Nabin Hait
3b8623e207
Merge pull request #16491 from adityahase/ar-fix 
fix(ar-summary): Changes to column list to match recent changes
 2019-01-29 11:28:02 +05:30
Nabin Hait
e8190473f5
Merge branch 'staging-fixes' into unicode 2019-01-29 11:13:04 +05:30
Nabin Hait
596c1b3489
Merge pull request #16220 from SaiFi0102/Party-Ledger-Summary 
feat: Party Ledger Summary Report
 2019-01-25 11:22:55 +05:30
rohitwaghchaure
7e4cf62a15
Merge pull request #16370 from rohitwaghchaure/show_outward_entries_in_negative 
Show outward entries in negative for Bank Clearance Summary report
 2019-01-24 22:13:40 +05:30
Aditya Hase
a40c43e414 fix(ar-summary): Changes to column list to match recent changes 2019-01-24 19:13:32 +05:30
Frappe Bot
e415cce1a9 Merge branch 'staging' into develop 2019-01-23 08:19:00 +00:00
Nabin Hait
4ef578e1c4
Merge pull request #16406 from rohitwaghchaure/newchanges_in_tds_reports 
fix: Multiple fixes in the reports
 2019-01-23 12:05:36 +05:30
Aditya Hase
f3c22f342c fix(unicode): Import unicode_literals in every file 2019-01-22 18:36:10 +05:30
Sagar Vora
4d1a9b10ed Merge branch 'staging' into develop 2019-01-22 15:56:39 +05:30
Rohit Waghchaure
ddd9136d10 Renamed field and added finance book column in the trial balance simple report 2019-01-22 14:11:57 +05:30
Aditya Hase
d157ae17b7 fix(ar-summary-report): Changes to column list to match recent changes in AR report 2019-01-22 13:37:54 +05:30
deepeshgarg007
3565395e7a Merge branch 'email_digest' of https://github.com/deepeshgarg007/erpnext into email_digest 2019-01-21 15:03:51 +05:30
deepeshgarg007
aab6d0e028 fix(email_digest): Linkes annual income and annual expense to profit and loss statement 2019-01-21 15:01:40 +05:30
deepeshgarg007
ff1078f271 fix(minor): fetch payment terms if voucher nos are available 2019-01-21 09:43:56 +05:30
Deepesh Garg
f7fe08c487
Merge branch 'develop' into email_digest 2019-01-20 16:53:41 +05:30
Saif Ur Rehman
31d58eac01 fix(Party Ledger Summary): Added Supplier/Customer Name column 2019-01-19 15:28:53 +05:00
Saif Ur Rehman
55566b7f8e fix(Party Ledger Summary): Codacy fix 2019-01-19 15:12:08 +05:00
Saif Ur Rehman
fcaed12a53 Merge branch 'Party-Ledger-Summary' of https://saifi0102@github.com/SaiFi0102/erpnext.git into Party-Ledger-Summary 2019-01-19 13:18:23 +05:00
Nabin Hait
bace4d3e6d
Merge pull request #16358 from adityahase/naming-series 
feat(naming): Deferred naming for SLE and GL Entry
 2019-01-18 10:55:30 +05:30
Nabin Hait
bef2c22d23 Fix: merge conflict 2019-01-18 10:15:47 +05:30
Rohit Waghchaure
fa7ee0b3b6 Added dafult bank account in the customer/supplier 2019-01-17 15:45:27 +05:30
Nabin Hait
873442a55d
Merge branch 'staging-fixes' into Party-Ledger-Summary 2019-01-16 17:52:45 +05:30
Nabin Hait
28ccaa3c88
Merge branch 'staging-fixes' into Gross-Profit-Return-Fix 2019-01-16 17:49:22 +05:30
Saif Ur Rehman
fccb1e55ec fix(Gross Profit Report): corrected fieldnames in return invoice query 2019-01-16 14:36:55 +05:00
Rohit Waghchaure
affeb3dfec Added on account amount field in Accounts Payable/Receivable Summary 2019-01-15 17:38:31 +05:30
Rohit Waghchaure
1a4c1e11cb Fix: total invoiced amount in Accounts Receivable Summary report showing blank 2019-01-15 17:01:34 +05:30