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

22103 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shreya
fd47b92138 renamed color field 2018-05-01 18:55:17 +05:30
Shreya
9c688f6dbf color field for calendar in leave application 2018-05-01 18:55:17 +05:30
Shreya
a7b2fc9250 color field for calendar in sales order and work order 2018-05-01 18:55:17 +05:30
Shreya
62907472f3 color field for calendar in task 2018-05-01 18:54:20 +05:30
Shreya
d71c0c1720 color field for calendar in holiday list 2018-05-01 18:54:20 +05:30
Shreya
4c8a08effb color field for calendar in course schedule 2018-05-01 18:54:20 +05:30
Nabin Hait
48c0b3b328 Merge branch 'tundebabzy-new-subscription' into develop 2018-04-30 19:33:15 +05:30
Nabin Hait
3652a62b55 minor fixes 2018-04-30 19:32:29 +05:30
Ameya Shenoy
da33b14f78 removed bad code and made compatible with pip 10 (#13805) 2018-04-30 11:17:12 +05:30
Shreya Shah
05ad2802c6 Travis test fixes for leave application (#13790) 
* test fix

* expense claim test fix

* fix payroll entry test case
 2018-04-30 11:14:56 +05:30
Adam Dawoodjee
3cd4fce710 Typo fix (#13809) 2018-04-30 11:13:18 +05:30
Manas Solanki
5cc41907a4
Merge pull request #13811 from frappe/manassolanki-patch-5 
Remove the duplicate description
 2018-04-27 12:47:24 +05:30
Manas Solanki
0536baacc2
Remove the duplicate description 2018-04-27 12:46:56 +05:30
Faris Ansari
9f739fe87d Handle item_wise_tax_detail invalid value while item renaming (#13778) 2018-04-26 18:48:01 +05:30
Kenneth Sequeira
b01f998b49 Update tracking-project-profitability-using-cost-center.md (#13792) 
Fixed typo in the title.
 2018-04-26 18:40:14 +05:30
AravindPranera
805f09a3fe Accounts receivable aging based on supplier due date (#13801) 2018-04-26 18:02:37 +05:30
rohitwaghchaure
7e8a7ac6ee Provision to select opening stock in stock reconciliation (#13802) 2018-04-26 16:30:35 +05:30
Rushabh Mehta
369afce43c [patch] ignore validations while creating custom fields for gst via patch 2018-04-26 10:10:03 +05:30
Manas Solanki
30c267bec6
Merge pull request #13784 from KanchanChauhan/typo-fix 
[Typo Fix] in Work Order
 2018-04-25 17:23:36 +05:30
Kanchan Chauhan
7826dd1aeb Typo Fix in Work Order 2018-04-25 13:48:47 +05:30
Saurabh
1d5bbe1081 Merge branch 'master' into develop 2018-04-25 12:46:50 +05:30
Saurabh
07d030208f Merge branch 'hotfix' 2018-04-25 12:46:48 +05:30
Saurabh
47f6e32920 bumped to version 10.1.27 2018-04-25 13:16:48 +06:00
Saurabh
7bd1453f8f
Merge pull request #13785 from rohitwaghchaure/fix_patch_pos_taxes 
[Fix] POS Patch
 2018-04-25 12:44:20 +05:30
Rohit Waghchaure
bf416cfbf8 [Fix] POS Patch 2018-04-25 12:32:22 +05:30
Saurabh
63590496c1 [fix] resolved merge conflicts 2018-04-25 11:32:54 +05:30
Saurabh
67918fff32 Merge branch 'hotfix' 2018-04-25 11:31:48 +05:30
Saurabh
132dac9712 bumped to version 10.1.26 2018-04-25 12:01:48 +06:00
rohitwaghchaure
57914f140e [HotFix] Taxes not adding in POS sales invoice (#13776) 2018-04-24 19:19:47 +05:30
Nabin Hait
5643c3ead2 Minor fix in reloading email template 2018-04-24 17:51:13 +05:30
Shridhar Patil
02c93a3d05 [bug] Leave application ui issues fixed (#13740) 
* validate to_date in leave application

if to_date is less than from_date show message to user
reset to_date value to ''

* var declaration and semicolon missed

* Updated popup message
 2018-04-24 14:45:11 +05:30
Kenneth Sequeira
70330e8379 fixed user permission video link (#13774) 2018-04-24 14:12:41 +05:30
Shreya Shah
3cf35f2496 fix syntax (#13773) 2018-04-24 12:20:21 +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
bghayad
1c3830c53f Student Account Ledger Button (#13591) 
* Student Account Ledger Button

* Student Account Ledger Button

* Student Account Ledger Button

* Student Account Ledger Button
 2018-04-24 12:12:11 +05:30
Kenneth Sequeira
5becde7a45 embedded social login keys set up videos (#13659) 2018-04-24 12:11:29 +05:30
hiousi
38de994788 do not copy template description to variant if not in allow fields (#13726) 2018-04-24 12:10:45 +05:30
Saurabh
9738d52d5f Merge branch 'master' into develop 2018-04-24 12:09:40 +05:30
Saurabh
ede0af97cd Merge branch 'hotfix' 2018-04-24 12:09:38 +05:30
Saurabh
ad4ede0e23 bumped to version 10.1.25 2018-04-24 12:39:38 +06:00
Saurabh
cfcf9b3832
Merge pull request #13772 from saurabh6790/supp_240418 
typo fix
 2018-04-24 12:08:38 +05:30
Shreya Shah
6db3d84cc0 remove unused code (#13765) 2018-04-24 12:07:40 +05:30
Saurabh
d2065ce3bf typo fix 2018-04-24 12:07:37 +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
Saurabh
8f29159fb7 Merge branch 'hotfix' 2018-04-24 11:12:07 +05:30
Saurabh
d9f1b539dc bumped to version 10.1.24 2018-04-24 11:42:07 +06:00
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
Manas Solanki
276a92539d
Update move_leave_approvers_from_employee.py 2018-04-23 14:55:19 +05:30
Prateeksha Singh
60bd383a25
Merge pull request #13763 from pratu16x7/hotfix 
[fix] cal view start end date field discrepancies
 2018-04-23 13:34:49 +05:30