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

37894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
c485d5c3b7 fix: Ignore GL Entry on cancel 2021-07-25 19:46:50 +05:30
Deepesh Garg
f4701c174a fix: Exchange rate revaluation posting date and precision fixes 2021-07-25 19:46:20 +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
Rucha Mahabal
017ed3f5c1
fix: employee status server-side validation (#26615) 2021-07-24 00:08:02 +05:30
rohitwaghchaure
9052a3b1a8
Merge pull request #26614 from rohitwaghchaure/fixed-serial-no-not-link-to-batch-error 
fix: serial no and batch validation
 2021-07-23 23:38:02 +05:30
Subin Tom
fac88a3329 fix: Supplier Invoice Importer fix 2021-07-23 21:23:48 +05:30
Subin Tom
2fc39fcade Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2021-07-23 20:55:24 +05:30
rohitwaghchaure
9ef157b23b
fix: wrong operation time in Work Order (#26613) 
* 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>
 2021-07-23 20:44:34 +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
Rohit Waghchaure
45d506c489 fix: serial no and batch validation 2021-07-23 16:40:45 +05:30
GangaManoj
add2030553 fix: Sider issues 2021-07-23 03:58:27 +05:30
GangaManoj
aed39a23dc fix: Rename tests 2021-07-23 03:45:59 +05:30
GangaManoj
13e7103ee0 fix: Add test to check if payment terms are fetched when creating a Purchase Invoice 2021-07-23 03:44:56 +05:30
GangaManoj
de6d960381 fix: Add test to check if payment terms are fetched when creating a Purchase Invoice 2021-07-23 03:36:37 +05:30
GangaManoj
9c07454f91 fix: Add test to check if payment terms are fetched when creating a Sales Invoice 2021-07-23 03:23:29 +05:30
GangaManoj
caa106b3bd fix: Add test to check if payment terms are fetched when creating a Sales Invoice 2021-07-22 22:58:45 +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
rohitwaghchaure
56c67743ab
fix: incorrect bom name (#26600) 2021-07-22 16:10:06 +05:30
Ankush
5b32fa5ccd
fix: SQL error on fetching RM in production plan (bp #26592) 
* fix: SQL error on fetching RM in production plan

* refactor: avoid passing by reference and mutations
 2021-07-22 14:00:01 +05:30
Devin Slauenwhite
0d968fabfe fix: missing parameter 'country' 2021-07-22 13:44:09 +05:30
marination
eecfc4c0ae fix: Clean Serial No input on Server Side 2021-07-22 13:23:54 +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
rohitwaghchaure
49c5cd66f3
Merge pull request #26586 from rohitwaghchaure/removed-remarks-field-from-ar-ap-report 
fix: removed Remarks column from AR/AP report
 2021-07-22 10:27:15 +05:30
GangaManoj
4323f4bcac fix: Modify set_payment_schedule() to include fetch_payment_terms_from_order() 2021-07-22 05:57:42 +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
6928fc17c6
chore: remove warning rules 
semgrep-action doesn't consider severity, hence ignoring these rules for now.
 2021-07-21 19:56:15 +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
Rohit Waghchaure
f3158ea448 fix: removed Remarks column from AR/AP report 2021-07-21 19:47:41 +05:30
rohitwaghchaure
ac6bfeaa8d
Merge pull request #26558 from rohitwaghchaure/fixed-incorrect-gross-profit-report 
fix: incorrect valuation rate calculation in gross profit report
 2021-07-21 19:35:55 +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
rohitwaghchaure
f60cba28ab
Merge pull request #26506 from 18alantom/bp-fix-ig-portal-field-filter 
fix: check if field_filters is None
 2021-07-21 11:28:06 +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
57514f7b1d
feat(Non Profit): API Endpoint to update halted Razorpay subscriptions (#26427) (#26564) 
* 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:46:34 +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
GangaManoj
46bed5e6cc fix: Add mandatory_depends_on property for Discount Account 2021-07-20 22:03:44 +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
Ganga Manoj
41705acbd9
fix: delete child docs when parent doc is deleted (#26518) 
* fix: Make code more readable

* fix: Delete child table info when parent doc is deleted

* fix: Sider issues

* fix: Remove trailing whitespace
 2021-07-20 20:48:57 +05:30
Subin Tom
2d225e621f
fix: Price list rate not fetched for return sales invoice fixed (#26560) 
Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
 2021-07-20 20:41:04 +05:30
Afshan
1321c26a03
Merge branch 'develop' into ignore-mandatory-in-payment-reconcilitation 2021-07-20 20:07:43 +05:30
Rohit Waghchaure
c14aa45720 fix: incorrect valuation rate calculation in gross profit report 2021-07-20 18:19:15 +05:30