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

29947 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
ecba5c40bb
Merge pull request #20657 from anuradha-8/develop 
fix: date of birth cannot be greater than today on student application form
 2020-02-18 14:10:47 +05:30
rohitwaghchaure
0abc181360
Merge pull request #20638 from nextchamp-saqib/pos-mode-of-pay-fix 
fix: disabled mode of payments fetches in sales invoices
 2020-02-18 12:38:06 +05:30
rohitwaghchaure
15ca1181f8
Merge pull request #20654 from marination/precision-mr-item 
fix: Stock Quantity not calculated on client side in Material Request Items.
 2020-02-18 12:34:16 +05:30
Deepesh Garg
15ff6a594b
feat: Inter warehouse stock transfer on valuation rate with taxation (#20083) 
* fix: Validation for target warehouse

* feat: Get items on valuation rate in delivery note on Internal transfers

* fix: Create Inter company purchase receipt from delivery note

* feat: Inter company stock transfer on valuation rate with taxation

* fix: Add from warehouse in purchase invoice

* fix: Use get_value instead of get_cached_value

* fix: Get incoming rate instead of valuation rate

* fix: GL entry for from warehouse in purchase receipt

* fix: GL Entries fixes in purchase invoice

* fix: Address and tax fetching fixes

* fix: Add test case for stock transfer via purchase receipt

* fix: Code cleanup, added validations and test cases

* fix: Validation for supplier warehouse

* fix: Test Cases

* fix: Change validation condition

* fix: Address fixes while creating Purchase Receipt from delivery note

* fix: Set taxes while creating Purchase Receipt from Delivery Note

* fix: Update set_missing_value function

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-18 12:28:41 +05:30
Anuradha Kalaskar
93e8fc1833 fix: date of birth cannot be greater than today on student application form 2020-02-18 11:32:35 +05:30
marination
e143983819 fix: Stock Quantity not calculated on client side in Material Request Items. 2020-02-18 10:51:54 +05:30
Marica
db00270895
feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order (#20371) 
* feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order

* fix: Query with filters, UX enhancements and cleanup
 2020-02-17 15:58:08 +05:30
thefalconx33
23e728612f fix: disabled mode of payments fetches in sales invoices 2020-02-17 14:15:20 +05:30
Suraj Shetty
f5b74d2aee
Merge pull request #20637 from gavindsouza/package-json 
chore: fix typo in package.json
 2020-02-17 13:13:58 +05:30
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
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
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
jsukrut
c0fd30a7ec fix: Indentation 2020-02-15 17:33:52 +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
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
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
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
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
thefalconx33
9225159d8c fix: mandatory warehouse wrror while updating items after submission 2020-02-09 12:19:03 +05:30
gavin
b8a0370219
Merge branch 'develop' into snyk-fix-bfc98e30e876ad63a72b641a42881bc9 2020-02-08 18:45:17 +05:30
Rohit Waghchaure
f0d27528e3 fix: time out error while submitting the purchase receipt which has more than 100 serial nos 2020-02-07 14:42:33 +05:30
Deepesh Garg
ed5c05b0f7
Merge pull request #20533 from rohitwaghchaure/procurement_tracker_not_working_for_special_char_company_name 
fix: Procurement Tracker report not working
 2020-02-07 10:43:11 +05:30