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

30176 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gavin D'souza
7a46aae57a fix: updated package.json 
* fixed devDependencies typo which possibly caused
    https://discuss.erpnext.com/t/bin-sh-1-snyk-not-found-when-bench-update/58035
    which was introduced in https://github.com/frappe/erpnext/pull/20563

    * Added missing fields for package meta data
 2020-02-17 12:20:25 +05:30
Deepesh Garg
a6701aa7bc
Merge pull request #20569 from Er-Naren719/feat-user-table-columns-updated 
feat: columns under user table updated
 2020-02-17 11:15:05 +05:30
Shivam Mishra
c14f49c079 fix: filters for quality_procedure tree 2020-02-17 11:12:28 +05:30
Deepesh Garg
5894c2d005
Merge pull request #20595 from anuradha-8/develop 
fix: to date cannot be less than from date validation on student leave application form
 2020-02-17 10:57:29 +05:30
Deepesh Garg
fd182b80ac
Merge pull request #20616 from Darpan245/develop 
fix: Mandatory field property failed to work based on the selection of…
 2020-02-17 10:35:56 +05:30
rohitwaghchaure
de4bd56212
Merge pull request #20631 from P-Froggy/patch-2 
Fix: Add missing bank accounts reference in supplier dashboard
 2020-02-17 09:57:57 +05:30
P-Froggy
b3712158ae
Bank accounts reference in supplier dashboard 
Adds a reference to linked bank accounts in supplier dashboard, which was previously missing.
 2020-02-16 19:10:53 +01:00
indictrans
ad5da823e1 fix:Future date of birth accepted at Sibling Detail section in Student form #20619 2020-02-16 22:59:41 +05:30
Deepesh Garg
bd582cfc39
Merge pull request #20629 from shrikant9867/develop 
fix:User allowed to set student DOB can not be greater than Joining Date #20628
 2020-02-16 18:46:30 +05:30
shrikant dixit
e329d417d6 fix: Added validation for student DOB can not be greater than Joining Date 2020-02-15 18:20:05 +05:30
indictrans
1118ee07a8 fix:Future date of birth accepted at Sibling Detail section in Student form #20619 2020-02-15 17:37:39 +05:30
jsukrut
c0fd30a7ec fix: Indentation 2020-02-15 17:33:52 +05:30
jsukrut
c3a23ddbe3 fix: restricted duplicate courses on Program Enrollment doctype (#20611) 2020-02-15 16:39:51 +05:30
Yugandhara
ce1f6a73e2 fix: Changes done to get valid sales order list on production plan form(#20609) 2020-02-15 16:31:53 +05:30
jsukrut
3a6ca13b44 fix:Mandatory field property failed to work based on the selection of field 'Group Based on' on 'Student Group' Page #20605 2020-02-15 16:18:17 +05:30
Yugandhara
e997168a23 fix: unused variable cdn removed 2020-02-15 16:14:46 +05:30
Yugandhara
af2b39891e fix: Changes done to get valid sales order list on sales order child table of production plan 2020-02-15 16:01:41 +05:30
anil pise
7c474130ea fix: Removed Missing semicolon and Mixed spaces and tabs and Trailing spaces not allowed. 2020-02-15 15:58:57 +05:30
Khushal Trivedi
37eb22e506 Merge branch 'develop' of https://github.com/khushalti/erpnext into develop 2020-02-15 15:47:17 +05:30
Khushal Trivedi
dc39b4ba13 fix: validation on max group strength student group form 2020-02-15 15:38:16 +05:30
anil pise
21b1a00f61 Fix:Child account which is not a group account is treating as Parent Account while creating New Department. #20599 2020-02-15 15:23:15 +05:30
pratik.m
c224cf761f fix: restricted duplicate topics on Course doctype (#20594) 2020-02-15 13:22:17 +05:30
Anuradha Kalaskar
21d662f96d fix: to date cannot be less than from date validation on student leave application 2020-02-15 13:17:57 +05:30
Yugandhara
ad645afeb2 fix: Changes done to get valid customer and employee list on payment entry form 2020-02-15 10:56:41 +05:30
Khushal Trivedi
6ee4c09854 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-02-14 19:23:37 +05:30
Raffael Meyer
772394b95a fix header 2020-02-13 20:58:59 +01:00
Raffael Meyer
54717fa993 update cloumn names 2020-02-13 20:58:44 +01:00
Raffael Meyer
3bacdf1f4b quote format name 2020-02-13 20:40:15 +01:00
Raffael Meyer
96b66dfae6 update TRANSACTION_COLUMNS according to "DATEV Format v7.0" 2020-02-13 20:37:37 +01:00
Raffael Meyer
b555ed0cba update header accoding to "DATEV Format v7.0" 2020-02-13 20:05:27 +01:00
Raffael Meyer
8818850174 consutant number and client number are mandatory 2020-02-13 17:13:15 +01:00
Raffael Meyer
46cf20825b generated on is datetime, not date 2020-02-13 17:09:22 +01:00
Raffael Meyer
0070805bbb add format version (data type) 2020-02-13 17:06:06 +01:00
Raffael Meyer
7d2777870e bump version number 2020-02-13 17:05:37 +01:00
Raffael Meyer
4fb897728b EXTF must be in quotes 2020-02-13 17:02:01 +01:00
rohitwaghchaure
c2c12dc82f
Merge pull request #20572 from abhijitkumbharInd/develop 
Production Plan | Get items from Sales Order not fetching grand total value
 2020-02-13 10:09:24 +05:30
rohitwaghchaure
a7423ecb45
Merge pull request #20578 from sunnyakaxd/patch-3 
fix: Syntax error in `get_child_warehouses`
 2020-02-13 10:08:32 +05:30
Raffael Meyer
0fac1f9429 Add groups for account types "Bank" and "Cash" 2020-02-12 13:59:48 +01:00
Raffael Meyer
cad404c355 Merge branch 'develop' into skr03_gnucash 2020-02-12 13:58:53 +01:00
Himanshu Mishra
b76d2d4d98
Fix: Syntax error in get_child_warehouses 2020-02-12 13:22:05 +05:30
rohitwaghchaure
f00de72744
Merge pull request #20541 from rohitwaghchaure/fixed_purchase_receipt_time_out_error_develop 
fix: time out error while submitting the purchase receipt which has m…
 2020-02-11 19:56:19 +05:30
rohitwaghchaure
490b843ecf
Merge branch 'develop' into fixed_purchase_receipt_time_out_error_develop 2020-02-11 19:56:11 +05:30
rohitwaghchaure
3d98c59585
Merge pull request #20555 from ashish-greycube/fix_actual_qty_for_backflush 
fix: backflush raw material based on - Material Transferred for Manufacture
 2020-02-11 19:50:36 +05:30
rohitwaghchaure
c4c91195e7
Merge pull request #20563 from gavindsouza/drop-cypress 
chore: Drop cypress
 2020-02-11 19:30:27 +05:30
abhijitkumbharIND
a67ae3ad31 fix: Production Plan | Get items from Sales Order not fetching grand total value. #20568 2020-02-11 16:45:59 +05:30
Rucha Mahabal
ba740ff558 feat: show linked Sales Invoice in Patient Appointment after booking 2020-02-11 16:27:22 +05:30
Er-Naren719
94e14257fb feat: column width increased for view attachments field (#314) 2020-02-11 15:21:48 +05:30
Deepesh Garg
65a53ba86c
Merge pull request #20565 from vishdha/filter_serial_based_on_batch_v13 
fix: filter serial no based on batch no
 2020-02-11 13:45:21 +05:30
Deepesh Garg
93b98774e7
Merge pull request #20519 from ahmad18189/patch-3 
automatic booking of asset depreciation fix
 2020-02-11 13:44:29 +05:30
Rucha Mahabal
4dd6f0ae9b fix: non-empty service unit set as empty after booking appointment 2020-02-11 13:39:18 +05:30