nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-05 14:38:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,089 Commits 460 Branches 1,744 Tags
3d047b83fd2ee835ddadd2a0f61a26e7116a76f6
Commit Graph

37089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
GangaManoj
f99696b75d fix: Condition for fetching Payment Terms from Sales/Purchase Orders 2021-08-02 23:15:44 +05:30
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
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
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
GangaManoj
57df4a3aa1 fix: Rename tests 2021-07-29 19:27:54 +05:30
GangaManoj
0413a5aafd fix: Add test to check if payment terms are fetched when creating a Purchase Invoice 2021-07-29 19:27:52 +05:30
GangaManoj
e94604f517 fix: Add test to check if payment terms are fetched when creating a Purchase Invoice 2021-07-29 19:26:39 +05:30
GangaManoj
293c5e10c3 fix: Add test to check if payment terms are fetched when creating a Sales Invoice 2021-07-29 19:26:39 +05:30
GangaManoj
59d1cc02c5 fix: Add test to check if payment terms are fetched when creating a Sales Invoice 2021-07-29 19:26:39 +05:30
GangaManoj
def7cc6cb3 fix: Modify set_payment_schedule() to include fetch_payment_terms_from_order() 2021-07-29 19:26:39 +05:30
GangaManoj
6333c3bee5 fix: Remove unused imports 2021-07-29 19:26:00 +05:30
GangaManoj
b389c9e375 fix: Fetch Payment Terms from Sales/Purchase Orders 2021-07-29 19:25:29 +05:30
GangaManoj
1011c1b01a fix: Clear Payment Schedule if PI has default Payment Schedule, but linked PO doensn't 2021-07-29 19:24:29 +05:30
Deepesh Garg
19a6d80927 fix: Parent condition in pricing rules 2021-07-29 18:47:16 +05:30
Rohit Waghchaure
379ce70126 fix: remove cancelled entries from Stock and Account Value comparison report 2021-07-29 18:06:17 +05:30
Deepesh Garg
e014d7a00e Merge pull request #26710 from deepeshgarg007/tds_194q_calculations 
fix: TDS calculation for first threshold breach for TDS category 194Q
 2021-07-29 15:55:16 +05:30
Saqib
e39bbc85e1 fix: cannot cancel payment entry if linked with invoices (#26703) 2021-07-29 15:46:25 +05:30
Nabin Hait
237150d1f4 Merge pull request #26630 from rohitwaghchaure/show-progress-completion-status-in-repost-item-valuation 
fix: added progress bar in repost item valuation to check the status
 2021-07-29 15:37:35 +05:30
Deepesh Garg
4c681592bf fix: TDS calculation for first threshold breach for TDS category 194Q 2021-07-29 15:26:19 +05:30
Frappe PR Bot
6a71955b99 chore: change location of backport action (#26705) (#26707) 
(cherry picked from commit e906acdc49)

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-07-29 14:28:13 +05:30
Jannat Patel
285463b031 Merge pull request #23129 from anupamvs/email-digest 
fix: multiselect recipients in Email Digest
 2021-07-29 12:36:49 +05:30
Ankush
8859574aab feat: don't recompute taxes (#26694) 2021-07-29 11:09:22 +05:30
Anupam
e5fea372af fix: frappe linter 2021-07-29 11:05:38 +05:30
Anupam
b1350af1f6 fix: setup wizard 2021-07-28 23:54:46 +05:30
Anupam Kumar
89f2138fbc Merge branch 'version-13-hotfix' into email-digest 2021-07-28 18:24:29 +05:30
Frappe PR Bot
1b6dd84c0a fix(bom): remove manual permission checking (#26689) (#26690) 
get_list does the permission checking.

(cherry picked from commit d95f16ac8f)

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-07-28 18:11:11 +05:30
Deepesh Garg
4c0dfdb398 Merge pull request #26687 from deepeshgarg007/fieldtype_fix 
fix: Change fieldtype from data to check
 2021-07-28 15:59:08 +05:30
Deepesh Garg
fa8e6ac7cd fix: Patch 2021-07-28 15:30:05 +05:30
Afshan
90c5cb0a31 fix: documentation link for E Invoicing (#26685) 2021-07-28 13:42:33 +05:30
Deepesh Garg
9350249941 fix: Chnage fieldtype from data to check 2021-07-28 12:57:59 +05:30
Deepesh Garg
7365e9704f Merge pull request #26683 from deepeshgarg007/tds_194q_fix 
fix(minor): Consider grand total for threshold check
 2021-07-28 11:56:29 +05:30
Deepesh Garg
1c9e516092 fix: GL Entries for discount amount with item qty greater than 1 2021-07-28 11:38:44 +05:30
Deepesh Garg
64af124f88 fix(minor): Consider grand total for threshold check 2021-07-28 10:43:02 +05:30
Raffael Meyer
ac2e139d5b fix: force reload of Opportunity in patch (#26668) 2021-07-28 00:14:59 +05:30
Rohit Waghchaure
56b81565fa fix: added progress bar in repost item valuation 2021-07-27 22:11:30 +05:30