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

4543 Commits

Author SHA1 Message Date
deepeshgarg007
f34e4f0e36 fix: Test case for inter-company-transaction 2019-04-25 14:28:57 +05:30
deepeshgarg007
4a4ce12eb4 fix: Commonfied code for inter-company-transaction 2019-04-25 14:28:19 +05:30
Nabin Hait
aa028d7856 fix: don't allocate advances if POS 2019-04-23 21:44:21 +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
Saif Ur Rehman
a216844d2c fix: Set Allocate Advance Automatically disabled by default 2019-04-22 12:10:40 +05:00
Faris Ansari
733ff48d51
fix: Refactor for Print Format changes (#17242) 
- Rename Server to Jinja
- Rename Js to JS
 2019-04-22 12:08:18 +05:30
Nabin Hait
d21bacfc21 fix: Total row alignment in AR report 2019-04-20 10:58:58 +05:30
Nabin Hait
c8b1351e87 fix: fetch party account as discounted receivable account in payment entry 2019-04-19 21:33:29 +05:30
Nabin Hait
4a5bed5c07 fix: fetch party account as discounted receivable account in payment entry 2019-04-19 21:33:29 +05:30
Nabin Hait
06f992f850
Merge pull request #17299 from nabinhait/inv-disc-fixes 
fix: Close loan considering latest invoice outstanding balance
 2019-04-19 21:27:02 +05:30
Nabin Hait
375f051b24
Merge pull request #17277 from nabinhait/invoice-discounting-fixes 
Invoice discounting fixes
 2019-04-19 20:00:18 +05:30
Nabin Hait
d2797be1cd fix: Close loan considering latest inv outstanding balance 2019-04-19 15:33:05 +05:30
Nabin Hait
8da71cebb7 fix: test cases 2019-04-19 15:10:02 +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
Nabin Hait
c99c712913 fix: Validate and update invoice discounting status on JE submit/cancel 2019-04-18 15:52:50 +05:30
Nabin Hait
8170585faf fix: Don't fetch already discounted invoice 2019-04-18 15:13:18 +05:30
Nabin Hait
36bb3f55f2 fix: Added invoice discounting dashboard 2019-04-18 14:47:44 +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
Rushabh Mehta
59c5a16037 fix(account_balance_timeline): remove unused import 2019-04-16 15:11:45 +05:30
Rushabh Mehta
1c2eb51a91 fix(api) 2019-04-16 11:12:34 +05:30
Rushabh Mehta
6dff8038e6 fix(account_balance_timeline) 2019-04-16 09:35:46 +05:30
Rushabh Mehta
7efe01578d fix(account_balance_timeline) 2019-04-16 09:33:21 +05:30
Nabin Hait
e9d9576cd7
Merge pull request #17231 from nabinhait/Anurag810-invoice-discounting 
Invoice Discounting
 2019-04-15 21:14:19 +05:30
Nabin Hait
076cc38c29 fix: Outstanding amount on making payment against discounted invoice 2019-04-15 18:42:10 +05:30
Rushabh Mehta
44b0cb6383
Merge pull request #17194 from rmehta/dashboard-refactor 
fix(dashboard): as per new features
 2019-04-15 16:52:54 +05:30
Nabin Hait
d584cfbf43 Fixed merge conflict 2019-04-15 16:16:25 +05:30
Nabin Hait
9fd3f10b67
Merge pull request #17220 from Anurag810/payment-entry-fix 
fix: handle for party type member in payment entry (v12)
 2019-04-15 10:06:08 +05:30
rohitwaghchaure
033b1babe8
Merge pull request #17186 from rohitwaghchaure/bank_account_in_bank_reconcilliation 
feat: Added bank account no in bank reconcilliation
 2019-04-14 16:10:19 +05:30
Anurag Mishra
95714297a4 fix: handle for party type member in payment entry 2019-04-12 15:03:46 +05:30
Nabin Hait
165e92ad5b
Merge pull request #17210 from rohitwaghchaure/fix_taxes_and_charges_are_adding_multiple_times 
fix: Taxes and charges table not clear the existing rows if the template is changed
 2019-04-12 11:02:37 +05:30
Rohit Waghchaure
72cc37e8da fix: Taxes and charges table not clear the existing rows if the template is changed 2019-04-11 18:35:15 +05:30
Rushabh Mehta
d625c32ab1 fix(dashboard): for frappe updates, and a new splash logo 2019-04-11 16:13:58 +05:30
Mangesh-Khairnar
3ab2a18088
Merge branch 'develop' into so-on-hold 2019-04-11 15:49:06 +05:30
Faris Ansari
6472ed2c1e
Merge pull request #16941 from Mangesh-Khairnar/po-on-hold 
Feature: Purchase order on hold
 2019-04-11 15:36:54 +05:30
Nabin Hait
89206e74d0 fixed merge conflict 2019-04-11 12:31:14 +05:30
Anurag Mishra
4c29d80cf1 fix: minor fixes 2019-04-11 11:14:32 +05:30
Anurag Mishra
accf310aa3 fix: start date and loan period should be mandatory 2019-04-11 11:08:07 +05:30
rohitwaghchaure
6cd114b467
Merge pull request #17198 from rohitwaghchaure/fix_auto_assign_payment_entry_to_invoice 
fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled
 2019-04-11 09:57:45 +05:30
Rohit Waghchaure
49907e746b fix: test cases 2019-04-10 17:33:32 +05:30
Rohit Waghchaure
b286fc99b8 fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled 2019-04-10 16:16:30 +05:30
Rohit Waghchaure
30fda3ee54 feat: Added bank account no in bank reconcilliation 2019-04-09 18:58:23 +05:30
Rushabh Mehta
bead5b33f4 fix(dashboard): as per new features 2019-04-09 18:38:03 +05:30
Nabin Hait
1245139c51
Merge branch 'develop' into invoice-d 2019-04-09 15:27:13 +05:30
Anurag Mishra
67e6da2086 fix: Removed Extra page on generating pdf in print formats 2019-04-09 15:19:05 +05:30
Anurag Mishra
ef11d378d4 fix: UI on generating pdf in print format 2019-04-09 15:19:05 +05:30
Anurag Mishra
ed82e8ba3b fix: removed before from accounts_controlle.pyr and fetch the gl from frontend 2019-04-09 15:19:05 +05:30
Anurag Mishra
b62cfffdea fix: Print Auditing print format 2019-04-09 15:19:05 +05:30
Mangesh-Khairnar
16c4fd6733 Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold 2019-04-09 12:13:45 +05:30
Rushabh Mehta
0d3986c9f6 fix(dashboard): account timeline for balance sheet accounts 2019-04-09 11:36:41 +05:30