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

28350 Commits

Author SHA1 Message Date
Deepesh Garg
c525b372c6 fix: Tests 2021-08-02 12:40:00 +05:30
Deepesh Garg
92f7a5a390 fix: GL For taxes if discount applied on Grand Total 2021-08-02 12:39:43 +05:30
Deepesh Garg
b7267f8f5f fix: Syntax Error 2021-08-02 12:39:22 +05:30
Subin Tom
e99cd2e9da
fix: POS Invoice consolidated Sales Invoice field set to no copy (#26706) 2021-08-02 11:39:20 +05:30
Subin Tom
3b7615750a
fix: POS Item Cart non-stop scroll issue (#26692) 2021-08-02 11:37:38 +05:30
Subin Tom
58118d7830
fix: missing QR Code in auto email attachment (#26598) 2021-08-02 11:34:43 +05:30
rohitwaghchaure
31fe5f5b92
fix: added progress bar in repost item valuation (#26680) 2021-08-02 11:01:30 +05:30
Anuja Pawar
4ec02ad91d
Merge branch 'develop' into sa-vat-report 2021-08-02 10:42:04 +05:30
Nabin Hait
493029195c fix: Additional salary processing 2021-08-01 19:47:42 +05:30
Rohit Waghchaure
343143037c fix: conflicts 2021-08-01 14:45:24 +05:30
Rohit Waghchaure
8cb560c753 bumped to version 13.8.0 2021-08-01 14:55:09 +05:50
Deepesh Garg
36f6e9b58e
Merge pull request #26654 from marination/pi-expense-account 
fix: Set Expense account from warehouse only if warehouse exists (Inter company invoice)
 2021-07-31 17:32:24 +05:30
Rohit Waghchaure
6fffc90b46 chore: Added change log for v13.8.0 2021-07-31 16:22:12 +05:30
rohitwaghchaure
41da6f0d13
Merge pull request #26735 from rohitwaghchaure/fixed-cogs-in-purchase-receipt 
fix: COGS account in purchase receipt
 2021-07-31 14:50:47 +05:30
Nabin Hait
99afe375ea
Merge pull request #26237 from rtdany10/patch-5 
feat: Increase number of supported currency exchanges
 2021-07-31 11:34:15 +05:30
Rohit Waghchaure
2a14f255cf fix: COGS account in purchase receipt 2021-07-31 11:14:14 +05:30
Deepesh Garg
6eded547f5 fix: TDS calculation for first threshold breach for TDS category 194Q 2021-07-30 20:12:51 +05:30
Rucha Mahabal
1a2332a81c
fix: student category mapping from the program enrollment tool (#26716) 
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
 2021-07-30 18:30:15 +05:30
Marica
7cbd755951
Merge branch 'develop' into serial-no-space 2021-07-30 14:09:19 +05:30
Saqib
d4ae1febe3
fix: gl entries for exchange gain loss (#26734) 2021-07-30 11:21:49 +05:30
Rucha Mahabal
821db5cce7
fix: employee status server-side validation (#26442) 
* fix: employee status server-side validation

* fix: test

* test: employee inactive status

* fix: test
 2021-07-30 10:21:42 +05:30
rohitwaghchaure
50b4b70589
Merge pull request #26727 from deepeshgarg007/pricing_rule_item_group_v13 
fix: Parent condition in pricing rules
 2021-07-29 20:06:47 +05:30
Deepesh Garg
9c7a9f3a13 fix: Parent condition in pricing rules 2021-07-29 20:02:49 +05:30
Marica
0eed394f5e
Merge branch 'develop' into stock-reco-fetch-non-empty-stock 2021-07-29 19:54:56 +05:30
rohitwaghchaure
22eac9bd0c
Merge pull request #26720 from rohitwaghchaure/skip-cancelled-entries-in-report-develop 
fix: remove cancelled entries from Stock and Account Value comparison report
 2021-07-29 19:50:00 +05:30
Ankush
57cd273f7c
fix: empty "against account" in Purchase Receipt GLE bp #26712 (#26719) 
* fix: correct field for GLE against account in PR

* fix: remove incorrect field check from reposting
 2021-07-29 19:49:36 +05:30
marination
533ee9a401 feat: (Stock Reco) Ignore Empty Stock while fetching items from warehouse 
- Added checkbox to `Fetch Items from Warehouse` dialog to ignore empty stock
- fix: Items fetched twice due to Item Defaults
- Improved code readability
 2021-07-29 19:39:32 +05:30
GangaManoj
c7c90244fe fix: Check if Purchase Order has Payment Terms Template 2021-07-29 19:19:46 +05:30
rohitwaghchaure
020b8ae110
Merge pull request #26721 from rohitwaghchaure/skip-cancelled-entries-in-report-pre 
fix: remove cancelled entries from Stock and Account Value comparison report
 2021-07-29 19:18:58 +05:30
Rohit Waghchaure
a6d276a06f fix: remove cancelled entries from Stock and Account Value comparison report 2021-07-29 19:16:20 +05:30
Rohit Waghchaure
c1c5a4ae17 fix: remove cancelled entries from Stock and Account Value comparison report 2021-07-29 19:15:34 +05:30
Deepesh Garg
8b7e3775c2
Merge pull request #26712 from ankush/against_acc_pr 
fix: empty "against account" in Purchase Receipt GLE
 2021-07-29 19:10:38 +05:30
Jannat Patel
e99f68fd7e
fix: expense claim semgrep issue (#26709) 
* fix: expense claim semgrep issue

* fix: sider
 2021-07-29 18:31:38 +05:30
Saqib
bbb96899a5
Merge branch 'develop' into po-payment-terms 2021-07-29 17:23:09 +05:30
Dany Robert
2833a02e0e
Merge branch 'develop' into patch-5 2021-07-29 16:47:28 +05:30
Dany Robert
909995a441
fix: issue with cache.setex 2021-07-29 15:58:27 +05:30
Ankush Menat
5764b49767
fix: remove incorrect field check from reposting 2021-07-29 15:41:22 +05:30
Ankush Menat
c3e739caf8
fix: correct field for GLE against account in PR 2021-07-29 15:34:18 +05:30
Nabin Hait
ebbabf11e9
Merge pull request #25944 from ruchamahabal/fix-employee-onboarding-status 
fix: boarding status in Employee Onboarding and Separation
 2021-07-29 15:24:54 +05:30
rohitwaghchaure
04ff0bc40d
Merge pull request #26264 from noahjacob/mr_allowance_feat 
feat: over transfer allowance for material transfers
 2021-07-29 11:18:37 +05:30
Ankush
f8343890b9
feat: don't recompute taxes (#26695) 2021-07-29 11:09:34 +05:30
Anupam
a6ce1244a0 fix: sider issues 2021-07-29 10:43:21 +05:30
Anuja
5dcd5e48e7 fix: fixed zero tax rate issue by adding custom field 2021-07-29 00:54:48 +05:30
Deepesh Garg
c6fe601efa
Merge pull request #26677 from deepeshgarg007/tds_enhancements_v13 
feat: Enhancements in TDS
 2021-07-28 20:58:42 +05:30
Deepesh Garg
e79bfbb104
Merge pull request #26665 from ankush/dont_recompute_taxes 
feat: don't recompute taxes
 2021-07-28 19:36:27 +05:30
Anupam
47a651a80f fix: removing depends_on for contact fields 2021-07-28 18:21:19 +05:30
Anupam
49cfac0ef0 feat: added basic info. of lead in header part 2021-07-28 17:51:35 +05:30
Deepesh Garg
6ac68f3bc7 fix: Patch 2021-07-28 17:19:00 +05:30
Deepesh Garg
8c7d9efa9d fix: Chnage fieldtype from data to check 2021-07-28 17:18:50 +05:30
Ankush
8ed7a21cd5 fix(bom): remove manual permission checking (#26689) 
get_list does the permission checking.

(cherry picked from commit d95f16ac8f)
 2021-07-28 11:12:27 +00:00
Ankush
d95f16ac8f
fix(bom): remove manual permission checking (#26689) 
get_list does the permission checking.
 2021-07-28 16:38:59 +05:30
Anupam
f4f0dde838 feat: unlinking dynamic links on trash 2021-07-28 16:16:52 +05:30
Marica
d43e6ced91
Merge branch 'develop' into pi-expense-account 2021-07-28 14:38:48 +05:30
walstanb
655b5dc190 fix: date as reference_date from bank transactions 2021-07-28 14:30:11 +05:30
Afshan
42bc0a7db8
fix: documentation link for E Invoicing (#26684) 2021-07-28 13:42:53 +05:30
Afshan
868a6cb26d
fix: documentation link for E Invoicing (#26686) 2021-07-28 13:42:13 +05:30
rohitwaghchaure
36bf5c7ed4
Merge branch 'develop' into mr_allowance_feat 2021-07-28 11:52:57 +05:30
Deepesh Garg
441adf763f fix(minor): Consider grand total for threshold check 2021-07-28 10:51:50 +05:30
Frappe PR Bot
3a39c0f19a
fix: force reload of Opportunity in patch (#26668) (#26681) 
(cherry picked from commit ac2e139d5b)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2021-07-28 00:19:32 +05:30
rohitwaghchaure
c1eb5a06a3
Merge pull request #26679 from rohitwaghchaure/removed-remarks-field-from-ar-ap-report-develop 
fix: removed Remarks column from AR/AP report
 2021-07-27 22:23:40 +05:30
Rohit Waghchaure
5d121c41f3 fix: removed Remarks column from AR/AP report 2021-07-27 22:22:56 +05:30
rohitwaghchaure
69983eb8ff
Merge pull request #26678 from rohitwaghchaure/fixed-dict-object-has-no-attr-develop 
fix: not able to add employee in the job card
 2021-07-27 22:22:10 +05:30
Rohit Waghchaure
7903aeca7e fix: not able to add employee in the job card 2021-07-27 22:19:41 +05:30
Deepesh Garg
5a7fad8a6a feat: Enhancements in TDS 2021-07-27 18:55:14 +05:30
rohitwaghchaure
82d0cfc68e
Merge pull request #26676 from rohitwaghchaure/fixed-dict-object-has-no-attr-pre 
fix: not able to add employee in the job card
 2021-07-27 18:46:59 +05:30
Rohit Waghchaure
940356d28a fix: not able to add employee in the job card 2021-07-27 18:45:17 +05:30
Ankush
7a97b6d6a8 fix: reload manufacturing setting before patch (#26641) 
(cherry picked from commit c8d7a8c781)
 2021-07-27 11:19:33 +00:00
Anupam
ee1089ca4f Merge branch 'develop' of https://github.com/frappe/erpnext into campaign-module 2021-07-27 16:49:24 +05:30
Anupam
f1c697ca75 fix: sider issue 2021-07-27 16:49:04 +05:30
Deepesh Garg
9d8efbe1db
Merge pull request #26651 from deepeshgarg007/exchange_rate_reval_fixes_v13_pre_release 
fix: Exchange rate revaluation posting date and precision fixes
 2021-07-27 16:41:59 +05:30
Deepesh Garg
3ee61af676
Merge pull request #26628 from deepeshgarg007/exchange_rate_reval_fixes 
fix: Exchange rate revaluation posting date and precision fixes
 2021-07-27 16:41:04 +05:30
Ankush
c8d7a8c781
fix: reload manufacturing setting before patch (#26641) 2021-07-27 16:39:38 +05:30
Ankush Menat
dfdd1c6e02
feat: don't recompute taxes 2021-07-27 14:49:44 +05:30
Rohit Waghchaure
6b482ebb0f fix: serial no and batch validation 2021-07-27 13:42:37 +05:30
Deepesh Garg
2dbfb932b4
Merge pull request #26618 from nemesis189/supplier-invoice-importer-fix 
fix: Supplier invoice importer fix
 2021-07-27 10:27:07 +05:30
Anuja Pawar
9302e0b6c5
Merge branch 'develop' into sa-vat-report 2021-07-27 10:18:53 +05:30
Deepesh Garg
831ce88d1c
Merge pull request #26643 from nemesis189/ignore-mandatory-in-payment-reconcilitation-pre-release 
fix:Ignore mandatory fields while creating payment reconciliation Journal Entry
 2021-07-27 10:16:04 +05:30
Deepesh Garg
af84ce9216
Merge pull request #26647 from deepeshgarg007/gst_sales_register_fix_v13 
fix(India): Default value for export type
 2021-07-27 10:12:33 +05:30
Anupam Kumar
34353df48c
fix: sales pipeline graph issue (#26626) 2021-07-27 09:47:44 +05:30
Jannat Patel
ae9d1d9617
fix: Salary component account filter (#26604) 
* fix: salary component account filter

* fix: cleanup
 2021-07-27 09:40:12 +05:30
Ankush Menat
03a6c38f06
test: fix test due to rename change 2021-07-26 22:24:25 +05:30
marination
77f9f048b6 chore: test case for missing default warehouse on mapping 2021-07-26 21:33:17 +05:30
Marica
a4bafe2dbf
Merge branch 'develop' into pi-expense-account 2021-07-26 20:15:20 +05:30
marination
5c82af50f9 fix: Set Expense account from warehouse only if warehouse exists 2021-07-26 19:41:53 +05:30
Deepesh Garg
1b6c75bbb1
Merge pull request #26642 from deepeshgarg007/gstr_3b_missing_cess_develop 
fix: Add missing cess amount in GSTR-3B report
 2021-07-26 19:21:29 +05:30
Deepesh Garg
61d014d249
Merge pull request #26644 from deepeshgarg007/gstr_3b_missing_cess_v13 
fix: Add missing cess amount in GSTR-3B report
 2021-07-26 19:20:50 +05:30
Deepesh Garg
8a6aa0d788
Merge pull request #26645 from deepeshgarg007/gst_reports_timeout_develop 
fix: GST Reports timeout issue
 2021-07-26 19:20:12 +05:30
Deepesh Garg
3fcc5e3134 fix: Convert null values to empty string on grouping 2021-07-26 19:09:09 +05:30
Deepesh Garg
19a0ca1980 fix: Ignore GL Entry on cancel 2021-07-26 19:08:56 +05:30
Deepesh Garg
356a55258e fix: Exchange rate revaluation posting date and precision fixes 2021-07-26 19:08:45 +05:30
Deepesh Garg
b23315a7e6
Merge branch 'develop' into exchange_rate_reval_fixes 2021-07-26 19:05:44 +05:30
Deepesh Garg
cba847b051 fix: Test case for GSTR-3b report 2021-07-26 18:46:27 +05:30
Deepesh Garg
a661667e2a fix(India): Default value for export type 2021-07-26 18:46:14 +05:30
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
Anuja Pawar
abc63cffa8 fix: suggested changes 2021-07-26 18:11:38 +05:30
Deepesh Garg
5fe7d80a64 fix: GST Reports timeout issue 2021-07-26 17:13:28 +05:30
Deepesh Garg
19589b1e21 fix: GST Reports timeout issue 2021-07-26 17:05:48 +05:30
Deepesh Garg
c468e4a93d fix: Add missing cess amount in GSTR-3B report 2021-07-26 16:58:07 +05:30
Deepesh Garg
00fd319531 fix: Add missing cess amount in GSTR-3B report 2021-07-26 16:52:54 +05:30
Subin Tom
50b76d04bf fix:Ignore mandatory fields while creating payment reconciliation Journal Entry 2021-07-26 16:52:05 +05:30
Deepesh Garg
4e0664b548
Merge branch 'develop' into supplier-invoice-importer-fix 2021-07-26 16:48:11 +05:30
Subin Tom
ed68f11a46
fix: Supplier invoice importer fix pre release (#26636) 
* fix: Supplier Invoice Importer fix
Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
 2021-07-26 16:47:36 +05:30
Noah Jacob
64454a5dc8 fix: included company in Link Document Type filters for contact (#26576) 
(cherry picked from commit cbddedab7b)
 2021-07-26 07:32:43 +00:00
Noah Jacob
cbddedab7b
fix: included company in Link Document Type filters for contact (#26576) 2021-07-26 12:54:35 +05:30
Rohit Waghchaure
60a0b7fe77 Merge branch 'version-13-hotfix' into 'version-13-pre-release-13-8' 2021-07-26 11:34:57 +05:30
Deepesh Garg
67273b9551 fix: Convert null values to empty string on grouping 2021-07-25 21:26:22 +05:30
Deepesh Garg
a8bf61c14e Merge branch 'develop' of https://github.com/frappe/erpnext into exchange_rate_reval_fixes 2021-07-25 19:58:04 +05:30
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
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
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
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
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