Shreya
462e18ad2e
Allowed To Transact With child table in Customer & Supplier
2018-05-02 14:34:14 +05:30
Faris Ansari
5df63e36d4
Merge branch 'hotfix' of https://github.com/frappe/erpnext into hotfix
2018-05-01 10:52:15 +05:30
Faris Ansari
bd99606a14
Change msgprint to unobtrusive alert
2018-05-01 10:52:02 +05:30
Zarrar
b0a46f397a
display customer's name while printing receivable report ( #13830 )
2018-04-30 19:40:18 +05:30
Nabin Hait
3652a62b55
minor fixes
2018-04-30 19:32:29 +05:30
Faris Ansari
8be895091e
Set is_pos to 0 in Opening Invoice Tool ( #13810 )
2018-04-30 11:13:06 +05:30
AravindPranera
805f09a3fe
Accounts receivable aging based on supplier due date ( #13801 )
2018-04-26 18:02:37 +05:30
deepak-mnt
b712d1905d
Override after_rename method to fetch cost center number on changing from title
2018-04-26 17:04:06 +05:30
deepak-mnt
b379998961
Added Update Cost Center Number button and it's functionality
2018-04-26 17:00:08 +05:30
Nabin Hait
dc75be8b6c
Show company column in order in consolidated financial statement
2018-04-26 12:16:38 +05:30
Rohit Waghchaure
4110e00b2d
[Fix] general ledger group by validation
2018-04-26 12:16:38 +05:30
Rohit Waghchaure
26decaad6c
[Fix] Profit and loss statment
2018-04-26 12:16:38 +05:30
Nabin Hait
f164203520
Fixed merge conflict
2018-04-26 12:16:18 +05:30
rohitwaghchaure
efff6e53de
Consolidated financial statement ( #13678 )
...
* added fields to support treeview
* tree file added, nestedset implemented
* patch added to reload doc and configure lft rgt
* Added consolidated financial statement report
2018-04-26 12:16:18 +05:30
rohitwaghchaure
fb9af38106
Group by party in general ledger report ( #13649 )
...
* Group wise Ledger for Customer and Supplier
* commonify group by fields
2018-04-26 12:16:18 +05:30
Nabin Hait
1c13e70d13
New doctypes for HR and Accounting ( #13652 )
2018-04-26 12:12:29 +05:30
Saurabh
63590496c1
[fix] resolved merge conflicts
2018-04-25 11:32:54 +05:30
rohitwaghchaure
57914f140e
[HotFix] Taxes not adding in POS sales invoice ( #13776 )
2018-04-24 19:19:47 +05:30
Shreya Shah
4dc453d131
Loan Management for the Members (Non Profit Module) ( #13149 )
...
* Renamed - Employee Loan Application to Loan Application, Employee Loan to Loan and field Employee Loan Account to Loan Account
* Patch added
* Dynamic link fields 'applicant' and 'applicant_type'
* Member link visible only if domain non profit is active
* Modified loan_dashboard
* Make Repayment Entry button
* Common file loan_common.js for loan and loan_application
* repayment schedule rows selection in dialog
* validation if repayment amount > total paid amount
* repayment only if disbursement is done, make repayment by selecting the installment which falls in the current month
* fetch nowdate if disbursement date not found
* Rebased with develop
* updated non-profit module page
* updated patch for renamed fields
* dialog to select repayment entries
* hidden field to store reschedule paid status
* update paid check in loan on journal entry updation
* calculate total paid
* updated docs
* codacy fix
2018-04-24 12:19:36 +05:30
Saurabh
9738d52d5f
Merge branch 'master' into develop
2018-04-24 12:09:40 +05:30
Rohit Waghchaure
31edddace6
[Fix] Tax not changes when user change the POS profile in the sales invoice
2018-04-24 11:43:31 +05:30
Saurabh
2e7a45dbb4
resolved merge conflicts
2018-04-24 11:16:13 +05:30
Deepak kumar
022ac50160
Reverse Journal Entry ( #13637 )
...
* [Fix] #13605
* fixes codacy
* minor changes
* Added naming series for reverse journal entry
* added reference_type and reference_name
2018-04-24 10:52:28 +05:30
tundebabzy
dbdf462e56
fix conflict
2018-04-22 23:49:26 +01:00
tundebabzy
f65ee888c0
spelling: canceled --> cancelled
2018-04-22 23:43:08 +01:00
Nabin Hait
c36524ec54
Update chart_of_accounts.py
2018-04-20 11:00:20 +05:30
Shreya Shah
44e719d64c
[Enhancement] Leave Application and Expense Claim ( #13645 )
...
* child table employee expense approver
* set query in department
* mandatory approver check in hr settings
* triggers on leave and expense approver
* fetch all parent approvers from department hierarchy
* fixes
* patch to move employee approvers from employee to department
* removed hard coding of roles
* modify approvers list query
* commonified functions
* patch
* renamed standard reply occurrences
* removed leave approvers table from Employee master
* email templates for leave application notification
* set default email templates for leave in hr settings
* notify by email template
* approval status in expense claim
* render template in patch
* removed unused code
* Single child table department approver
* read instead of render template
2018-04-19 20:58:52 -08:00
Saurabh
5b7503c074
Merge pull request #13691 from saurabh6790/supp_180417_1
...
[hotfix] multiple fixes
2018-04-19 15:57:35 +05:30
Zarrar
59f7b8c4a1
issue routing to report ( #13710 )
2018-04-18 02:56:02 -08:00
Saurabh
46ffbb74ff
fix cheque print measurements
2018-04-17 20:44:37 +05:30
tundebabzy
caae0f4dcc
Merge branch 'develop' into new-subscription
2018-04-17 09:34:04 +01:00
matmyers
742da8cfce
removed duplicate keys ( #13675 )
2018-04-17 12:20:57 +05:30
Saurabh
46743d00d6
Merge branch 'master' into develop
2018-04-17 12:00:21 +05:30
Saurabh
f2a941b1a4
[fix] check if supplier value exists ( #13616 )
2018-04-15 21:37:14 -08:00
Sathisha Poojary
16ce8ed7d5
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2018-04-14 12:05:11 +05:30
Faris Ansari
ed34a442a8
Obey currency filter in financial statement prints #pdd ( #13648 )
2018-04-13 21:34:00 -08:00
Nabin Hait
642d39098a
Fixed merge conflict
2018-04-13 14:38:57 +05:30
Faris Ansari
f8dd4c2d7b
[fix] Financial report column values during print ( #13627 )
2018-04-12 17:28:40 +05:30
Siddhi Sawant
a0bbc0846b
GST purchase invoice with tax breakup details ( #13561 )
2018-04-12 14:50:48 +05:30
rohitwaghchaure
2ea593bdd8
[Fix] POS Profile data not set in the sales invoice ( #13568 )
2018-04-12 13:37:08 +05:30
Sathisha Poojary
99e3ca0f67
Create a new doctype for bank so that we can suport other
...
bank statements dynamically.
2018-04-07 19:00:05 +05:30
Sathisha Poojary
6b8eb645c4
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2018-04-07 16:41:43 +05:30
Nabin Hait
e9638be032
fixed merge conflict
2018-04-06 15:18:27 +05:30
Rushabh Mehta
dccfb54a0f
[fix] [ux] allow account to be created via form ( #13509 )
2018-04-06 10:28:08 +05:30
rohitwaghchaure
aa7cddef5c
Merge pull request #13511 from rohitwaghchaure/table_styling
...
[Fix] Width and margin for account receivable pdc print format
2018-04-04 16:34:21 +05:30
Rohit Waghchaure
3d2b3d37d4
[Fix] Width and margin for account receivable pdc print format
2018-04-04 16:01:33 +05:30
Nabin Hait
2b682c82e8
Fixed merge conflict
2018-04-04 11:40:16 +05:30
rohitwaghchaure
eedc0ac681
[Fix] chart of accounts root type is mandatory issue in charts.erpnext.com ( #13467 )
2018-04-02 12:49:38 +05:30
Britlog
220864b4f7
Allow decimal quantities in pos ( #13471 )
2018-04-02 10:55:04 +05:30
Nabin Hait
c825e914d1
Added indexes for lft, rgt on nestedset doctypes ( #13420 )
2018-04-02 10:43:46 +05:30