nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-19 09:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,278 Commits 402 Branches 1,702 Tags
0cf3ab326424e761dcafe68923e4ff452b4d68ce
Commit Graph

38278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frappe PR Bot
b13e46071a fix: Let all System Managers be able to delete Company transactions (#26815) (#26819) 
(cherry picked from commit 884d8cf065)

Co-authored-by: Ganga Manoj <ganga.manoj98@gmail.com>
 2021-08-06 10:39:58 +05:30
Nabin Hait
894ed3a9a5 Merge pull request #26765 from frappe/revert-24206-additional_salary_tax_enhancements 
Revert "fix: Tax calculation for Recurring additional salary"
 2021-08-06 10:22:31 +05:30
GangaManoj
232c728636 Revert "fix: Only fetch default Payment Terms Template if present" 
This reverts commit fb80ca9e06.
 2021-08-05 23:04:58 +05:30
GangaManoj
fb80ca9e06 fix: Only fetch default Payment Terms Template if present 2021-08-05 22:04:11 +05:30
GangaManoj
5c21eea13d fix: Fetch discount details from Payment Terms only if Discount Type = Percentage 2021-08-05 21:50:09 +05:30
GangaManoj
e4a07d8ff3 fix: Stop fetching amount while fetching Payment Terms 2021-08-05 21:42:09 +05:30
Frappe PR Bot
6e07ec2617 fix: Do not fetch fully return issued purchase receipts (#26809) (#26825) 
(cherry picked from commit 1d90f7684e)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-08-05 20:13:28 +05:30
Noah Jacob
041ac339b1 style: improved formatting of sql query 2021-08-05 16:37:22 +05:30
Noah Jacob
b10465eebe refactor: created function to get bom_item for query 2021-08-05 16:37:22 +05:30
noahjacob
9b0b2daf4a refactor: updated sql query for item variants 2021-08-05 16:37:22 +05:30
noahjacob
cf4078756d fix: fixed fetching sales order of item variant in production plan 2021-08-05 16:37:21 +05:30
Frappe PR Bot
5b5a365aaf fix: POS payment modes displayed wrong total (#26808) 2021-08-05 11:15:16 +05:30
GangaManoj
4a6ef9ab0f fix: Compare Payment Schedules 2021-08-05 00:52:55 +05:30
GangaManoj
0b11420147 fix: Disable automcatically_fetch_payment_terms after running its associated tests 2021-08-05 00:35:45 +05:30
GangaManoj
23c104555b fix: Remove irrelevant code 2021-08-05 00:28:42 +05:30
Frappe PR Bot
bf8d0c256d fix: typo in error message (#26816) (#26817) 
(cherry picked from commit 005291e6dd)

Co-authored-by: François de Ryckel <f.deryckel@gmail.com>
 2021-08-04 22:01:17 +05:30
Noah Jacob
673bc58193 test: test case for over transfer of materials 2021-08-04 18:48:24 +05:30
Noah Jacob
8fced95f8c feat: over transfer allowance for material transfers 2021-08-04 18:48:24 +05:30
GangaManoj
8328f45230 fix: Rename test to reflect changes in code 2021-08-04 17:33:35 +05:30
Frappe PR Bot
13192e1db1 fix: trigger lost reason dialog when status is changed to lost (#26811) (#26812) 
(cherry picked from commit e5d8ba65ca)

Co-authored-by: Mohammed Yusuf Shaikh <49878143+mohammedyusufshaikh@users.noreply.github.com>
 2021-08-04 17:07:22 +05:30
Anupam Kumar
df477dcae6 fix: bank remittance report issue (#26398) (#26766) 2021-08-04 14:02:43 +05:30
Dany Robert
9f94c19752 fix: ignore permission to update call log (#26797) 
Backport of #26112
#no-docs
 2021-08-04 10:01:44 +05:30
Frappe PR Bot
1b9a5c851d fix: incorrect amount in work order required items table. (#26585) (#26623) 
* fix: amount in work order not equal to rate * qty

* fix: patch for amount in work order required items

(cherry picked from commit cd12d95a24)

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-08-03 20:06:36 +05:30
Frappe PR Bot
85815f989c fix: Reset weight_per_unit on replacing Item (#26619) (#26791) 
* fix: Assign Item's default weight_per_unit as its weight_per_unit in get_item_details

* fix: Set weight_uom in get_item_details as Item's default weight_uom

(cherry picked from commit 471f48f64d)

Co-authored-by: Ganga Manoj <ganga.manoj98@gmail.com>
 2021-08-03 20:06:07 +05:30
barredterra
c6c2773e02 refactor: def instead of lambda 2021-08-03 11:22:42 +02:00
barredterra
950521299a Merge branch 'version-13-hotfix' into datev_more_info 2021-08-03 10:47:57 +02:00
Frappe PR Bot
5a442f1bce fix: change format string to percent string interpolation (#26774) (#26778) 
(cherry picked from commit 7fe588e236)

Co-authored-by: Alan <2.alan.tom@gmail.com>
 2021-08-03 13:29:10 +05:30
Frappe PR Bot
373ed1f65c fix: remove limit from stock balance report (#26773) (#26779) 
(cherry picked from commit b3740e9afc)

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-08-03 13:28:50 +05:30
barredterra
c82611aa62 feat: sort timesheets by start time 2021-08-02 23:19:57 +02:00
barredterra
1110f88e5a feat: refactor and enhance sales invoice timesheet 2021-08-02 23:06:37 +02:00
GangaManoj
f99696b75d fix: Condition for fetching Payment Terms from Sales/Purchase Orders 2021-08-02 23:15:44 +05:30
barredterra
b57521a337 feat: add total_billing_hours to Sales Invoice 2021-08-02 18:37:45 +02:00
Deepesh Garg
db40d88fc2 Merge pull request #26780 from nemesis189/added-dispatch-address-to-sales-v13-new 
feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill
 2021-08-02 21:11:50 +05:30
Subin Tom
6ba11a382a test: Updated test case for Eway bill 2021-08-02 20:36:46 +05:30
Subin Tom
8800aaaee7 feat: Added fields for dispatch address in Sales Order, Sales Invoice, Delivery Note for Eway Bill 2021-08-02 20:36:37 +05:30
Ankush
e43bdf76a5 chore: warning for shopify integration deprecation (#26701) 
* chore: warning for shopify integration deprecation

* fix: warn deprecation during patch for sysadmins
 2021-08-02 18:57:48 +05:30
Frappe PR Bot
a9474a9fbd fix: POS Invoice consolidated Sales Invoice field set to no copy (#26768) 2021-08-02 12:25:27 +05:30
Subin Tom
4597f151f5 fix: POS Item Cart non-stop scroll issue (#26693) 2021-08-02 11:38:31 +05:30
Subin Tom
a75c7c48d8 fix: missing QR Code in auto email attachment (#26599) 2021-08-02 11:34:28 +05:30
Anupam Kumar
c2b5b0edee fix: bank remittance report issue (#26398) 2021-08-02 10:51:21 +05:30
Nabin Hait
74bb55bfd2 Revert "fix: Tax calculation for Recurring additional salary (#24206)" 
This reverts commit adfdc71844.
 2021-08-01 20:03:38 +05:30
Deepesh Garg
75f23aed1c fix: Multiple fixes in payment entry 2021-08-01 17:48:50 +05:30
Frappe PR Bot
b5c7fce689 fix: student category mapping from the program enrollment tool (#26716) (#26739) 
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
(cherry picked from commit 1a2332a81c)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-07-30 18:54:35 +05:30
Saqib
2d6f2fea5b fix: gl entries for exchange gain loss (#26728) 2021-07-30 10:55:53 +05:30
rohitwaghchaure
bd33bdf210 Merge pull request #26717 from deepeshgarg007/pricing_rule_item_group 
fix: Parent condition in pricing rules
 2021-07-29 19:51:53 +05:30
rohitwaghchaure
b7bbefee15 Merge pull request #26722 from rohitwaghchaure/skip-cancelled-entries-in-report 
fix: remove cancelled entries from Stock and Account Value comparison report
 2021-07-29 19:49:42 +05:30
Ankush
c7df759324 fix: empty "against account" in Purchase Receipt GLE bp #26712 (#26718) 
* fix: correct field for GLE against account in PR

* fix: remove incorrect field check from reposting
 2021-07-29 19:49:12 +05:30
Deepesh Garg
c02e42ff84 fix: Multiple fixes in payment entry 2021-07-29 19:46:17 +05:30
GangaManoj
01ab63189a fix: Check if Purchase Order has Payment Terms Template 2021-07-29 19:28:14 +05:30
GangaManoj
6343950d82 fix: Sider issues 2021-07-29 19:27:54 +05:30