Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,584 Commits 3 Branches 0 Tags 1 GiB
65628ac3e2
Commit Graph

30584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
65628ac3e2
Merge pull request #21283 from marination/stock-entry-get-items-mr 
fix: Fetch Material Requests with type Issue as well in Stock Entry via Get Items from
 2020-04-16 00:33:03 +05:30
Marica
3e541a1d04
Merge pull request #21285 from nextchamp-saqib/warehouse-fix-dev 
fix: warehouse unset if an item doesn't have default warehouse
 2020-04-15 23:55:36 +05:30
Marica
20ce433652
Merge branch 'develop' into warehouse-fix-dev 2020-04-15 23:48:27 +05:30
Saqib Ansari
f53299e98a fix: warehouse unset when cannot find item warehouse 
* cannot set delivery date when all items gets deleted and new are added
 2020-04-15 22:10:48 +05:30
Saqib Ansari
34640777cd fix: pos not accessible without default customer 2020-04-15 22:10:43 +05:30
marination
0b98a6296b fix: Fetch Material Requests with type Issue as well in Stock Entry via Get Items from 2020-04-15 21:19:04 +05:30
rohitwaghchaure
1c5b12e7d4
Merge pull request #21280 from anupamvs/opportunity-calendar 
Adding Opportunity Calendar View
 2020-04-15 19:29:49 +05:30
Anupam K
9ee8110411 Adding Calendar view for Opportunity 2020-04-15 18:37:35 +05:30
rohitwaghchaure
c3f994b15e
Merge pull request #21197 from marination/default-item-manufacturer 
feat: Provision to set Default Item Manufacturer
 2020-04-15 16:35:08 +05:30
Anupam K
c4c44a9a2b Initial JS setup 2020-04-15 12:58:24 +05:30
sahil28297
0ebcb4733a
Merge pull request #21276 from ruchamahabal/patch-fix 
fix: patch for Healthcare Refactoring
 2020-04-15 11:59:12 +05:30
sahil28297
dd719ea151
Merge branch 'develop' into patch-fix 2020-04-15 11:58:02 +05:30
Rucha Mahabal
11121f4905 fix: patch for Healthcare Refactoring 2020-04-15 11:53:39 +05:30
Deepesh Garg
10b68295ad
Merge pull request #21275 from deepeshgarg007/loan_topup_test_fix 
fix: Loan topup test
 2020-04-15 11:23:33 +05:30
Deepesh Garg
9e9d44d139 fix: Loan topup test 2020-04-15 11:20:24 +05:30
Deepesh Garg
863d90b8a4
Merge pull request #21261 from Alchez/dev-stock-available-order-desk 
fix: [minor] show stock UOM in POS (develop)
 2020-04-14 17:01:33 +05:30
Rohan Bansal
a1b747c3f3 fix: show stock UOM in POS 2020-04-14 14:28:56 +05:30
Himanshu
b84333f26e
fix: move to hooks (#21205) 2020-04-14 13:02:03 +05:30
rohitwaghchaure
fc31dbef12
fix: on changing qty free item not removed (#21251) 2020-04-14 12:53:54 +05:30
Deepesh Garg
dd78eb3842
Merge pull request #21252 from nextchamp-saqib/tax-breakup-for-cn 
fix: show positive taxes in credit notes
 2020-04-14 12:41:25 +05:30
Marica
8636914e9a
fix: Lead Contact with blank first name via Customer (#21247) 2020-04-14 11:53:09 +05:30
Faris Ansari
64f01bddc8
fix: Set Price List in case of User Permissions (#21237) 
Frontport of #18968
 2020-04-14 11:51:48 +05:30
Marica
02c9332695
fix: Project Update Email Error (#21208) 
* fix: Project Update Email Error

* Update project.json

Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
 2020-04-14 11:47:58 +05:30
Vishal Dhayagude
b1c2f4ef22
fix: str object not callable (#21227) 2020-04-14 11:42:52 +05:30
Mangesh-Khairnar
2e3548eb83
fix: consider revereted expired leaves entry (#21257) 2020-04-14 09:34:39 +05:30
Deepesh Garg
78c0841d64
Merge pull request #21249 from Thunderbottom/blanket-order-patch-fix 
chore: force reload doctype before running patch
 2020-04-13 18:59:31 +05:30
sahil28297
c11ac6a73f
Merge pull request #21255 from ruchamahabal/fix-patch 
fix: Healthcare Patch
 2020-04-13 18:56:51 +05:30
Rucha Mahabal
79bc819f92 fix: Healthcare Patch 2020-04-13 18:51:04 +05:30
Rushabh Mehta
4c0484b60e
Merge pull request #20811 from ruchamahabal/healthcare_refactor 
refactor: Healthcare Module
 2020-04-13 17:16:02 +05:30
Saqib Ansari
10a6a2d77f fix: show positive taxes in credit notes 2020-04-13 16:40:13 +05:30
Deepesh Garg
435c22e403
Merge pull request #21244 from deepeshgarg007/employee_loan_fixes 
fix: Employee loan fixes in new loan management module
 2020-04-13 16:32:42 +05:30
Deepesh Garg
40dcfd148b fix: Import Error 2020-04-13 16:29:58 +05:30
Chinmay D. Pai
de8554d0dc
chore: force reload doctype before running patch 
fixes Unknown column 'against_blanket_order' in 'field list'

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-04-13 16:03:22 +05:30
Marica
3ea95ee451
Merge pull request #21215 from vishdha/batch_message_v13 
fix(UX): batch error message improved
 2020-04-13 15:38:33 +05:30
Marica
3ce23858bf
Merge branch 'develop' into batch_message_v13 2020-04-13 13:20:25 +05:30
Deepesh Garg
03166fab56 Merge branch 'develop' of https://github.com/frappe/erpnext into employee_loan_fixes 2020-04-13 13:20:02 +05:30
Deepesh Garg
baa7521d02 fix: Allow repayment from Salary only for term loans 2020-04-13 13:18:11 +05:30
vishdha
cfaf638cc2 fix: batch message ux improved 2020-04-13 12:31:26 +05:30
Deepesh Garg
af27d61bee fix: Employee loan test case and other fixes 2020-04-13 12:29:00 +05:30
Deepesh Garg
0865625482
Merge pull request #21177 from nextchamp-saqib/purchase-register-filters 
feat: (minor) purchase register filters
 2020-04-11 18:12:00 +05:30
Deepesh Garg
fdc0eb2dd2
Merge pull request #21235 from mujeerhashmi/gstr_3b_report_fix 
fix: GSTR 3B Report tax amount calculation
 2020-04-11 18:11:36 +05:30
Syed Mujeer Hashmi
58a16f1a3b fix: GSTR 3B Report tax amount calculation 
The tax amount after discount amount should be considered for tax
calculation.

Fixes #21231

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
 2020-04-11 00:52:10 +05:30
Deepesh Garg
5e274965cc
Merge pull request #21201 from marination/serial-no-status 
fix: Added Status field in Serial No for filter and report builder
 2020-04-10 20:48:06 +05:30
Rucha Mahabal
59e6c7730b
Merge branch 'develop' into healthcare_refactor 2020-04-10 20:32:37 +05:30
Deepesh Garg
470679f227 fix: SQL ssyntax error 2020-04-10 20:22:42 +05:30
Deepesh Garg
9b312bfbd0 Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-register-filters 2020-04-10 20:19:30 +05:30
Deepesh Garg
e2a5828f5e
Merge pull request #21193 from nextchamp-saqib/pay-entry-ux-fix 
chore: hide redundant base received amount
 2020-04-10 20:17:56 +05:30
Deepesh Garg
669c5c6370
fix: Syntax Error 2020-04-10 20:15:53 +05:30
Deepesh Garg
550771058a
fix: Code styling 2020-04-10 20:14:29 +05:30
Deepesh Garg
f7e216e285 fix: Employee loan fixes 2020-04-10 20:03:11 +05:30