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

37440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Noah Jacob
ba18a96b0c test: test case for over transfer of materials 2021-07-26 18:12:40 +05:30
Noah Jacob
bc82344fc7 feat: over transfer allowance for material transfers 2021-07-26 18:12:37 +05:30
Noah Jacob
cbddedab7b
fix: included company in Link Document Type filters for contact (#26576) 2021-07-26 12:54:35 +05:30
Ankush
cd12d95a24
fix: incorrect amount in work order required items table. (#26585) 
* fix: amount in work order not equal to rate * qty

* fix: patch for amount in work order required items
 2021-07-25 13:10:50 +05:30
Ankush
96caae1f56
fix: wrong operation time in Work Order (#26613) (#26617) 
* fix: wrong operation time in Work Order

Top level item time operation was not considering the BOM.quantity

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2021-07-25 13:01:21 +05:30
Ankush
057a0a9842
ci: auto backport squashed commits based on labels (#26622) 2021-07-25 12:49:05 +05:30
Anurag0911
4128aa7628
fix: syntax error (#26610) 
Removed "," at erpnext/public/js/controllers/taxes_and_totals.js:87
 2021-07-23 16:52:42 +05:30
Nabin Hait
595c7a6e61 fix: merge conflict 2021-07-22 17:11:20 +05:30
Nabin Hait
338f436a1c Merge branch 'version-13-pre-release' into version-13 2021-07-22 17:05:51 +05:30
Nabin Hait
7551bcf421 bumped to version 13.7.1 2021-07-22 17:25:51 +05:50
rohitwaghchaure
ce3e877c40
fix: incorrect bom name (bp #26600) 2021-07-22 16:10:58 +05:30
Ankush
4ee6571784
fix: SQL error on fetching RM in production plan (#26592) 
* fix: SQL error on fetching RM in production plan

* refactor: avoid passing by reference and mutations
 2021-07-22 13:13:46 +05:30
Nabin Hait
13466bba90
Merge pull request #26588 from deepeshgarg007/tax_flow_fix_pre_release 
fix: Additional discount calculations in Invoices
 2021-07-22 11:30:47 +05:30
Deepesh Garg
9ab18b5341 fix: add company change trigger 2021-07-21 23:18:17 +05:30
Deepesh Garg
9fa92c912b fix: Revert refresh field 2021-07-21 23:18:17 +05:30
Deepesh Garg
72eb72f66f fix: Add update item tax template method back 2021-07-21 23:18:17 +05:30
Deepesh Garg
50b188214d revert: Client side handling for Dynamic GST Rates 2021-07-21 23:18:17 +05:30
Deepesh Garg
f9da88cb15 fix: Additional discount calculations in Invoices 2021-07-21 23:17:56 +05:30
Ankush Menat
28d52c4a95
chore: remove warning rules 
semgrep-action doesn't consider severity, hence ignoring these rules for now.
 2021-07-21 19:54:06 +05:30
rohitwaghchaure
6fbb2d3507
Merge pull request #26504 from 18alantom/fix-ig-portal-field-filter 
fix: check if field_filters is None
 2021-07-21 11:28:14 +05:30
Deepesh Garg
3e109840f9
Merge pull request #26464 from nemesis189/added-dispatch-address-to-sales 
feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill
 2021-07-21 10:52:10 +05:30
Rucha Mahabal
a758071532
feat(Non Profit): API Endpoint to update halted Razorpay subscriptions (#26427) 
* feat: Update Subscription Activated field to Subscription Status to accomodate Halted status

* feat: API Endpoint to halt Razorpay subscription

* fix: sider

* fix: validation message

* test: halted razorpay subscription
 2021-07-21 00:24:09 +05:30
Subin Tom
013b352639
fix: Price list rate not fetched for return sales invoice fixed (#26559) 
Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-07-20 21:03:11 +05:30
Suraj Shetty
47f200a70d
chore: Update stale.yml 
reduce `daysUntilStale` & `daysUntilClose` to keep the contributors active.
 2021-07-20 16:13:49 +05:30
Suraj Shetty
8790248318
Merge pull request #26554 from surajshetty3416/fix-customer-quick-entry 
fix: Pass doc and other parameters to properly prefill information
 2021-07-20 11:39:32 +05:30
Suraj Shetty
c077314568 fix: Pass doc and other parameters to properly prefill information 
- while creating customer from form dashboard
 2021-07-20 09:57:18 +05:30
Ankush
80e269887d
fix(ux): item description should fall back to name (#26339) 
Don't set item description = item code from front end. This is already
being set to item_name in before_insert and item_name is better
fallback than item code for description.

Also fixed wrong condition for erasing description while duplicating
item.
 2021-07-19 20:42:44 +05:30
Subin Tom
b24a149dbc test: Updated test case for Eway bill 2021-07-19 14:37:12 +05:30
Deepesh Garg
354e2984c2
Merge pull request #26541 from deepeshgarg007/travis_tax_setup 
fix: Typo and remove duplicate function
 2021-07-19 10:42:58 +05:30
Deepesh Garg
2686d04800 fix: Typo and remove duplicate function 2021-07-18 17:54:35 +05:30
Ankush
70a7252469
chore: update CODEOWNERS (#26536) 2021-07-17 12:48:40 +05:30
Nabin Hait
11475487fb fix: merge conflict 2021-07-16 15:58:50 +05:30
Nabin Hait
4e6f49209f Merge branch 'version-13-pre-release' into version-13 2021-07-16 15:21:33 +05:30
Nabin Hait
e079a1bb33 bumped to version 13.7.0 2021-07-16 15:41:33 +05:50
rohitwaghchaure
ad12fd75a8
Merge pull request #26529 from rohitwaghchaure/patch-to-fix-missing-fg-item-develop 
fix: added patch to fix missing FG item
 2021-07-16 15:12:46 +05:30
Rohit Waghchaure
56e4a88956 fix: added patch to fix missing FG item 2021-07-16 15:06:57 +05:30
Nabin Hait
e8abb201c1
Merge pull request #26526 from rohitwaghchaure/patch-to-fix-missing-fg-item-pre 
fix: added patch to fix missing FG item
 2021-07-16 15:05:16 +05:30
Rohit Waghchaure
0c6ca09e06 fix: added patch to fix missing FG item 2021-07-16 14:33:25 +05:30
Nabin Hait
f6d6897f34
Merge pull request #26525 from nabinhait/change-log-v13-7-0 
chore: Added change log for v13.7.0
 2021-07-16 13:09:31 +05:30
Nabin Hait
a0df79ee8c chore: Added change log for v13.7.0 2021-07-16 13:07:39 +05:30
Ankush
a6d80dcc2a
chore: disable semgrep on push events (#26523) 2021-07-16 13:01:57 +05:30
rohitwaghchaure
9ed36627d2
Merge pull request #26521 from rohitwaghchaure/fixed-fg-items-not-added-for-batch-item-develop 
fix: FG item not fetched in manufacture entry
 2021-07-16 11:40:23 +05:30
Rohit Waghchaure
df5c2b9aaf fix: FG item not fetched in manufacture entry 2021-07-16 11:35:14 +05:30
rohitwaghchaure
bae2890389
Merge pull request #26514 from ankush/backport/develop/pr-26240 
feat: provision to make subcontracted purchase order from the production plan (#26240)
 2021-07-16 11:29:34 +05:30
Ankush
1b5f3cf605
ci: make semgrep ignore existing errors (#26516) 2021-07-15 19:30:05 +05:30
Rohit Waghchaure
a748dd9261
feat: provision to make subcontracted purchase order from the production plan 2021-07-15 19:01:36 +05:30
Noah Jacob
d8668f78f4
fix: validation check when no conversion_factor (#26219) 2021-07-15 18:32:15 +05:30
Afshan
c66277e06b
fix: improving ux for additional discount field (#26495) 2021-07-15 18:10:17 +05:30
Noah Jacob
6442b5df11
fix: set default operation time to 0 (#26510) 2021-07-15 16:47:50 +05:30
Noah Jacob
2f775ee53c
fix: WIP needs to be set before submit on skip_transfer (#26507) 2021-07-15 16:29:28 +05:30