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

25543 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
5c86cf54a2
Merge pull request #16288 from Anurag810/task-fixes 
[fix] 'Expected End Date' in task should not be later than 'Expected End Date' of project
 2019-01-11 14:21:58 +05:30
Anurag Mishra
cd8908362a Changes Requested Done 2019-01-11 12:23:23 +05:30
Saif Ur Rehman
5085673030 test: fix for Item Tax Template v12 2019-01-11 03:53:43 +05:00
Nabin Hait
7e3c80bd8a
Merge pull request #16213 from nabinhait/pplan_fix 
fix(pro-plan): Actual Qty of RM considering children in case source warehouse is a group warehouse
 2019-01-10 17:57:28 +05:30
Nabin Hait
0d208851a4
Fix(stock-reco): Fixed codacy issues 2019-01-10 17:56:11 +05:30
Sagar Vora
f99e013ebc
fix: gstin validation should work when there is no state (#16378) 2019-01-10 11:57:24 +05:30
Nabin Hait
6b466fe230
Merge pull request #16326 from hrwX/hotfix-gst-fix 
fix: GSTIN validation
 2019-01-10 11:23:42 +05:30
Sagar Vora
07cf4e8f5b fix: use division consistent with Python 3 & other changes 2019-01-10 11:14:58 +05:30
Nabin Hait
187bdf08a6
Merge pull request #16319 from SaiFi0102/Gross-Profit-Exclude-Opening-Invoice 
fix: Exclude Opening Invoice from Gross Profit Report and Company Dashboard Chart
 2019-01-10 10:55:41 +05:30
Nabin Hait
afbdaa525e
Merge pull request #16365 from hiousi/patch-1 
fix: variant can not get its price
 2019-01-10 10:36:27 +05:30
Nabin Hait
c693cd7f10
Merge pull request #16341 from Mangesh-Khairnar/date-range-fix 
fix: Sales Analytics Period Range
 2019-01-10 10:35:31 +05:30
Nabin Hait
00d0f8bf26
Merge pull request #16371 from SaiFi0102/Override-Warehouse-Get-Item-Details 
fix: Give Precedence to set_warehouse in get_item_details
 2019-01-10 10:28:30 +05:30
Saif Ur Rehman
fc5c9b8ab8 chore: Move Item Tax Template patch to v12 2019-01-10 04:34:14 +05:00
Saif Ur Rehman
8d61794540 Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12 
# Conflicts:
#	erpnext/patches.txt
#	erpnext/stock/doctype/item/item.json
 2019-01-10 04:23:40 +05:00
Saif Ur Rehman
edd0e2476f chore: Updated item.json, no changes 2019-01-10 04:16:10 +05:00
deepeshgarg007
720020319f fix(Codacy): removed unused variable 2019-01-09 21:56:45 +05:30
deepeshgarg007
c039f70496 Test Cases for 
account balance report
 2019-01-09 21:56:45 +05:30
deepeshgarg007
8621869d24 Created multiple reports and linked them to email digest 2019-01-09 21:56:45 +05:30
deepeshgarg007
2b47d39274 feat: Links for reports in email digest 2019-01-09 21:54:40 +05:30
karthikeyan5
2825b929c1 fix(GSTIN Validation - india): added checksum validation for GSTIN 2019-01-09 19:15:10 +05:30
Deepesh Garg
9c5e9d79f1
Merge branch 'staging-fixes' into company_address 2019-01-09 17:19:20 +05:30
deepeshgarg007
d29ee97307 Addition of GST fields in Sales Order,Purchase Order,Purchase Receipt 2019-01-09 17:09:11 +05:30
Rohit Waghchaure
701c762a68 Show outward entries in negative for Bank Clearance Summary report 2019-01-09 14:21:03 +05:30
Saif Ur Rehman
2689dea72a fix: Give higher precedence to set_warehouse in get_item_details while setting item level warehouse 2019-01-09 13:43:06 +05:00
Jamsheer
319ca86c81 fix: Test Fee Validity 2019-01-09 13:29:20 +05:30
Saif Ur Rehman
eb7277d2d4 Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template 
# Conflicts:
#	erpnext/patches.txt
 2019-01-09 11:25:53 +05:00
Saif Ur Rehman
091cfba5fc test: Added test for get_item_tax_template and get_item_tax_map 2019-01-09 11:24:30 +05:00
Jamsheer
c0ac849776 fix: Helathcare Prcatitioner custom query escaped 2019-01-09 11:48:41 +05:30
Jamsheer
45c5138eaf fix: updated options for abdomen in Vital Signs 2019-01-09 11:19:27 +05:30
Jamsheer
f2d7e3309f fix: Patient Appointment - Calendar - status != Cancelled 2019-01-09 11:19:27 +05:30
Jamsheer
17bb0da278 fix: remove print statement 2019-01-09 11:19:27 +05:30
Jamsheer
c3804230cd fix: Patient - Quick Entry enabled 2019-01-09 11:19:27 +05:30
Jamsheer
52ac72e63e fix: Validate Patient Appointment 2019-01-09 11:19:27 +05:30
Jamsheer
c0097ad729 feat: Filter active Healthcare Practitioner 2019-01-09 11:19:27 +05:30
Jamsheer
fb7b5292b3 fix: Clinical Procedure - consume stock if items present 2019-01-09 11:19:27 +05:30
Jamsheer
3e01891e22 fix: Traverse note from procedure prescription to appointment 2019-01-09 11:19:27 +05:30
Jamsheer
f3c4f5a901 fix: Clinical Procedure - copy fields from appointment 2019-01-09 11:19:26 +05:30
Jamsheer
f4d0fcb836 fix: patient - user welcome email configuration 2019-01-09 11:19:26 +05:30
Jamsheer
b2c9268ece fix: Patient Appointment - Calendar - set color from appointment type 2019-01-09 11:19:26 +05:30
hiousi
9671438435
Update get_item_details.py 2019-01-08 22:23:45 +01:00
hiousi
1516e29609
[fix] variant can not get its price 
get_price_list_rate() return empty dict before trying to get the item price for a variant.
 2019-01-08 18:34:08 +01:00
Nabin Hait
bf0b6fd8a9
Merge pull request #16342 from finbyz/staging-fixes 
fix: rounded total if available while caclulating advance paid
 2019-01-08 20:29:32 +05:30
Nabin Hait
c13b0562ba
Merge pull request #16337 from Anurag810/Employee 
fix: Employee Onboarding/Seperation task Assignment
 2019-01-08 20:27:43 +05:30
Nabin Hait
142d8aa973
Merge pull request #16321 from rohitwaghchaure/fixed_bank_clearance_negtive_value_amt 
fix: negative amount showing in the bank clearance summary report
 2019-01-08 20:25:26 +05:30
Nabin Hait
e6ec6cccfa
Merge pull request #16316 from Anurag810/purchase-invoice-fixes 
fix: expense head of asset items in purchase invoice
 2019-01-08 20:23:14 +05:30
Nabin Hait
0f3ccba741
Update test_asset.py 2019-01-08 20:23:01 +05:30
Nabin Hait
2da5937864
Merge pull request #16314 from surajshetty3416/patch-to-rename-additional-salary-component 
fix: patch to rename additional salary component
 2019-01-08 20:21:16 +05:30
scmmishra
e2762df90b Fix: Naming series not reflecting in leave application 2019-01-08 17:38:28 +05:30
Saurabh
afec3ca89a Merge branch 'staging' into develop 2019-01-08 17:09:36 +05:30
Saurabh
1836285c01 bumped to version 11.0.3-beta.34 2019-01-08 16:52:38 +06:00