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

30151 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
vishal
998de83d48 fix: filter serial no based on batch no 2020-02-11 12:24:44 +05:30
Deepesh Garg
97669e975d
fix: Update condition 2020-02-11 10:18:39 +05:30
Deepesh Garg
c688f9f584
Merge pull request #20559 from rohitwaghchaure/added_indexing_on_columns_to_fix_performance_issue_develop 
fix: added indexing on columns to fix performace issue
 2020-02-11 10:12:49 +05:30
Gavin D'souza
47fac715be fix: move snyk to devDependencies 2020-02-11 00:44:23 +05:30
Gavin D'souza
a5fcd5468d chore: drop cypress requirement 2020-02-11 00:43:32 +05:30
Khushal Trivedi
bc3e3458fa Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-02-10 18:11:15 +05:30
Deepesh Garg
9462ba6559
feat: Group by item wise sales register (#20251) 
* fix: Group by sales register report

* fix: Remove group-by item

* fix: Grand total query fix

* fix: Remove debug param

* fix: Code cleanup and commonification

* fix: Add group by functionality to purchase register

* fix: Changes in total row display

* fix: Minor fixes

* fix: Add total row

* fix: Do not calculate total for rate
 2020-02-10 17:59:17 +05:30
Rohit Waghchaure
50886f02c3 fix: added indexing on columns to fix performace issue 2020-02-10 15:56:56 +05:30
Rohit Waghchaure
e55a927eee fix: test cases 2020-02-10 14:39:26 +05:30
Deepesh Garg
930e61d6e3 Merge pull request #20549 from nextchamp-saqib/so-update-items-warehouse-fix 
fix: mandatory warehouse wrror while updating items after submission
 2020-02-10 12:09:11 +05:30
ashish-greycube
121636f9bf fix: backflush raw material based on - Material Transferred for Manufacture 2020-02-10 10:49:50 +05:30
Deepesh Garg
0d75a920c2 Merge pull request #20553 from ruchamahabal/fix_regional_data 
fix: patch for creating irs_1099 custom field (United States)
 2020-02-10 09:08:33 +05:30
Rucha Mahabal
cf3c8174f6
Merge branch 'develop' into fix_regional_data 2020-02-10 00:40:21 +05:30
Rucha Mahabal
8334a3a1fd fix: patch for creating irs_1099 custom field (United States) 2020-02-10 00:34:09 +05:30
rohitwaghchaure
7d2c8cffb0
fix: pricing rule not working on item groups (#20547) 
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2020-02-09 21:23:53 +05:30
gavin
c866fa51c2 Merge pull request #20539 from frappe/snyk-fix-bfc98e30e876ad63a72b641a42881bc9 
[Snyk] Fix for 1 vulnerabilities
 2020-02-09 12:31:45 +05:30