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

31260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
anoop
afcf8efaaa Merge branch 'multi_company' of https://github.com/ESS-LLP/erpnext-healthcare into ess_pr_21253 2020-04-13 19:45:49 +05:30
anoop
2bdf21bd30 feat: multi-company billing 
sales onvoice - filter get items based on company
utils - company filters in all get item helper methods
utils - refactor appointemnt items
 2020-04-13 19:45:17 +05:30
anoop
93d6794d28 company field added 2020-04-13 19:45:17 +05:30
anoop
0bdb5ba0c5 feat: multi company support 2020-04-13 19:45:17 +05:30
anoop
35932f2491 feat: multi company support 2020-04-13 19:45:17 +05:30
anoop
db00dbf90e fix: company when creatign procedure, practitioner name added 2020-04-13 19:45:17 +05:30
anoop
b514b26242 fix: set company while creating encounter, fields rearranged 2020-04-13 19:45:17 +05:30
anoop
be2dc701c2 fix: vitals added naimg series, minor field rearrangements 2020-04-13 19:45:17 +05:30
anoop
407b33d7e0 feat: additional customer fileds 
add customer_group, price list, currency etc.
rearrange and group fields
disable cusotmer edit after save (temp fix)
 2020-04-13 19:45:16 +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
anoop
c01fb2a4d8 feat: multi-company billing 
sales onvoice - filter get items based on company
utils - company filters in all get item helper methods
utils - refactor appointemnt items
 2020-04-13 16:42:03 +05:30
Saqib Ansari
10a6a2d77f fix: show positive taxes in credit notes 2020-04-13 16:40:13 +05:30
anoop
f90ea8d622 company field added 2020-04-13 16:34:28 +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
anoop
0686c3d729 feat: multi company support 2020-04-13 16:32:35 +05:30
anoop
5f923fce2d feat: multi company support 2020-04-13 16:30:00 +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
Shivam Mishra
d9ce5843e5 chore: resolve conflicts 2020-04-13 13:43:04 +05:30
Shivam Mishra
affa2fba6b feat: updated non-profit.json 2020-04-13 13:42:01 +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
anoop
d2224626c7 fix: company when creatign procedure, practitioner name added 2020-04-13 12:11:59 +05:30
anoop
174dcee155 fix: set company while creating encounter, fields rearranged 2020-04-13 12:09:06 +05:30
anoop
9a6bf4e0c9 fix: vitals added naimg series, minor field rearrangements 2020-04-13 11:56:09 +05:30
anoop
3441d123b6 feat: additional customer fileds 
add customer_group, price list, currency etc.
rearrange and group fields
disable cusotmer edit after save (temp fix)
 2020-04-13 11:46:41 +05:30
Saqib
2e45076dcf
Merge branch 'develop' into asset-cat-validation 2020-04-12 13:39:43 +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
Saqib Ansari
397f894a7c fix: cannot iterate over dict_keys 2020-04-11 18:10:59 +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
Rucha Mahabal
1ff0cfd4f9 fix: merge conflicts 2020-04-10 18:58:25 +05:30