Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,439 Commits 3 Branches 0 Tags 1 GiB
843e440191
Commit Graph

25439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saurabh
75b4de3e20 bumped to version 11.1.18 2019-03-30 15:30:36 +06:00
rohitwaghchaure
892f675cf7
Merge pull request #17069 from frappe/revert-16950-fix-issue-credit 
feat: Revert "Fix(Delivery Note): Fix issue credit note"
 2019-03-30 14:25:08 +05:30
rohitwaghchaure
223bd45e06
Merge pull request #17039 from surajshetty3416/fix-bom-item-subquery-issue 
fix: Subquery in get_bom_items method
 2019-03-30 14:23:25 +05:30
rohitwaghchaure
f3a1fa0bae
Revert "Fix(Delivery Note): Fix issue credit note" 2019-03-30 12:33:54 +05:30
rohitwaghchaure
5fdbdd50f9
Merge pull request #16950 from hrwX/fix-issue-credit 
Fix(Delivery Note): Fix issue credit note
 2019-03-30 12:31:18 +05:30
Himanshu
52ae923566 fix(Update GSTIN): remove '.__' from template (#17061) 
'.__'  Avoid Server Side Template Injection
 2019-03-30 12:11:27 +05:30
rohitwaghchaure
9d159be826
Merge pull request #17064 from rohitwaghchaure/not_able_to_create_chart_of_account 
fix: user not able to create chart of account in parent if child has no chart of account
 2019-03-30 10:14:19 +05:30
rohitwaghchaure
d4365e25c4
Merge pull request #17063 from scmmishra/hotfix 
fix: healthcare unit type enable toggle
 2019-03-30 10:13:30 +05:30
scmmishra
6f82f96816 Merge branch 'hotfix' of https://github.com/frappe/erpnext into hotfix 2019-03-29 20:05:40 +05:30
rohitwaghchaure
8dadd4b0b2
Merge pull request #17059 from rohitwaghchaure/cherry_pick_test_case_fix 
fix: cherry-pick item variant test cases fix
 2019-03-29 19:32:30 +05:30
Rohit Waghchaure
fd2b1385a3 fix: user not able to create chart of account in parent if child has no chart of account 2019-03-29 19:20:47 +05:30
scmmishra
29dc744354 fix: healtcare unit type enable toggle 2019-03-29 19:00:45 +05:30
Himanshu
6343a697a2 fix(Salary Slip): Consider Leave without Pay for calculation (#16926) 
while net salary calculation, it was not considering actual days worked but now it will consider it
 2019-03-29 18:48:56 +05:30
rohitwaghchaure
13752774ab
Merge pull request #17000 from scmmishra/hotfix-task-status 
fix: Task overdue status propagates to project
 2019-03-29 18:44:36 +05:30
Rushabh Mehta
c4599c21c3 fix(test): item variant 2019-03-29 18:30:00 +05:30
rohitwaghchaure
fb8f1b93d6
Merge pull request #17058 from hrwX/bank_reco_fix 
fix(Bank Reconciliation): get credit and debit in float and not string
 2019-03-29 18:18:15 +05:30
Himanshu Warekar
f7f85f7379 fix: get credit and debit in float and not string 2019-03-29 16:19:15 +05:30
deepeshgarg007
4092ead41e fix: fetch account only if available 2019-03-29 16:19:04 +05:30
Faris Ansari
eec89ba4cb Merge branch 'hotfix' of https://github.com/frappe/erpnext into fix-leave-application-condition 2019-03-29 16:06:38 +05:30
Nabin Hait
862f77cc13 Merge branch 'deferred_revenue' into hotfix 2019-03-29 13:26:16 +05:30
Nabin Hait
66d07c2700 fix(accounts): Indentation 2019-03-29 13:25:11 +05:30
Nabin Hait
cf7538c17f
Merge pull request #17046 from nabinhait/deferred_revenue 
Refactor: deferred revenue booking logic
 2019-03-29 12:39:36 +05:30
rohitwaghchaure
043cfe99ad
Merge pull request #17051 from rohitwaghchaure/accounts_receivable_summary_issue 
fix: accounts receivable summary
 2019-03-29 09:28:21 +05:30
rohitwaghchaure
c268682772
Merge pull request #17048 from rohitwaghchaure/fixed_bank_reconciliation_not_working 
fix: bank reconciliation not working
 2019-03-29 09:27:50 +05:30
Rohit Waghchaure
9da14747aa fix: accounts receivable summary 2019-03-29 09:26:40 +05:30
Rohit Waghchaure
573d1dd31f fix: bank reconciliation not working 2019-03-28 20:39:49 +05:30
Nabin Hait
86fb523ea7 fix(accounts): codacy fixes 2019-03-28 20:06:57 +05:30
Nabin Hait
0a90ce5cf6 Refactored deferred revenue booking logic 2019-03-28 19:43:02 +05:30
Faris Ansari
f04988a02f fix: Missing "and" in filter conditions 2019-03-28 15:42:07 +05:30
Suraj Shetty
6262c9ed6a fix: Subquery in get_bom_items method 2019-03-28 14:59:27 +05:30
Saurabh
6cc9831ce9 Merge branch 'hotfix' 2019-03-28 13:51:58 +05:30
Saurabh
f2036dd1d1 bumped to version 11.1.17 2019-03-28 14:21:58 +06:00
Saurabh
1271dea39b
Merge pull request #17035 from gaurav-naik/issue-17033 
fix(regional,italy): autoset tax id, cf from customer before validating
 2019-03-28 12:46:24 +05:30
rohitwaghchaure
89a2577ae5
Merge pull request #17032 from surajshetty3416/fix-group-same-items-in-printview 
fix(print): Fix group same items for print view
 2019-03-28 12:42:22 +05:30
Gaurav
bd80fd13cb fix(regional,italy): autoset company cf, tax_id before validating 2019-03-28 12:18:03 +05:30
Saurabh
ea19250884
Merge pull request #16859 from rohitwaghchaure/added_new_tags_e_invoice_xml 
fix: added tags for discount amount, multiple customer po no, delivery notes
 2019-03-28 11:19:44 +05:30
Gaurav
010acf75fa fix(regional,italy): autoset tax id, cf from customer before validating missing values 
Fixes issue #17033
 2019-03-28 10:42:29 +05:30
Suraj Shetty
a7992ecb62 style: Fix formatting 2019-03-27 20:32:42 +05:30
Suraj Shetty
abc2a64d5e fix: Commonify get gl_entry code by moving it to accounts_controller 2019-03-27 20:25:18 +05:30
Sagar Vora
d20ecb0a71 fix(accounts): dependent field should be displayed after source link field 2019-03-27 17:42:42 +05:30
Rohit Waghchaure
1b7059b867 fix: ImponibileImporto calculation 2019-03-27 15:33:47 +05:30
scmmishra
2405e14dde Merge branch 'hotfix-task-status' of github.com:scmmishra/erpnext into hotfix-task-status 2019-03-27 15:02:35 +05:30
scmmishra
36824cf7fb feat: refactored update status 2019-03-27 15:01:40 +05:30
rohitwaghchaure
4510e3a836
Merge pull request #17020 from rohitwaghchaure/offline_pos_duplicate_records_making 
fix: offline pos, duplicate records creating
 2019-03-26 22:49:42 +05:30
Himanshu
e43b6beff0 fix(Leave Balance Report): total allocated leaves not calculated properly (#16969) 
* fix: total alloted leaves not calculated properly

* fix: Possible SQL injection

* typo fix in sql query

* prevent sql injection again ?

* Use ORM for query
 2019-03-26 21:42:12 +05:30
Rohit Waghchaure
22ebaf1b11 fix: added tags for discount amount, multiple customer po no, delivery notes 2019-03-26 20:19:46 +05:30
Rohit Waghchaure
1df62097f6 fix: offline pos, duplicate records creating 2019-03-26 19:15:53 +05:30
Prateeksha Singh
6d2bb9126a
Merge pull request #17019 from pratu16x7/hotfix-stock_entry_from_bom 
fix(uom): Get items as per UOM defined in BOM
 2019-03-26 18:00:50 +05:30
Nabin Hait
411f66a177
Merge pull request #17006 from deepeshgarg007/account-fix 
fix: Ignore root company validation setting in company master
 2019-03-26 17:49:21 +05:30
deepeshgarg007
3eeb1cacb0 fix: Change name to Allow Account Creation against Child Company in company master 2019-03-26 17:18:06 +05:30