nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-07 23:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,325 Commits 459 Branches 1,746 Tags
4c2fdfe2c187f21906acad9d4eb930285e9b0d6d
Commit Graph

40325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
c2b2b3962a Merge pull request #30429 from deepeshgarg007/transaction_issue 
fix: Check for onload property
 2022-03-25 21:51:07 +05:30
Deepesh Garg
71402b43a7 fix: Check for onload property 2022-03-25 21:49:19 +05:30
Deepesh Garg
0740158431 Merge pull request #30395 from deepeshgarg007/pos_write_off 
fix: Write off amount wrongly calculated in POS Invoice
 2022-03-25 20:56:19 +05:30
mergify[bot]
8b5fe164fd fix: show subassembly table always (#30422) (#30423) 
[skip ci]

(cherry picked from commit 0534cf6c9c)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-25 19:04:22 +05:30
Deepesh Garg
6a50f36b31 test: test for auto write-off amount 2022-03-25 18:02:14 +05:30
Deepesh Garg
665bd4c510 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into pos_write_off 2022-03-25 16:00:33 +05:30
Deepesh Garg
04a25b0e19 chore: version bump v13.23.2 2022-03-25 13:07:45 +05:30
Deepesh Garg
c2911998a1 Merge pull request #30415 from frappe/mergify/bp/version-13/pr-30406 
fix: Rate change issue on save and mapping from other doc (backport #30406)
 2022-03-25 13:02:17 +05:30
Deepesh Garg
73d4031100 Merge pull request #30414 from frappe/mergify/bp/version-13-pre-release/pr-30406 
fix: Rate change issue on save and mapping from other doc (backport #30406)
 2022-03-25 13:02:01 +05:30
Deepesh Garg
f892eb588a fix: Condition 
(cherry picked from commit 2e0e6ca6b1)
 2022-03-25 07:31:37 +00:00
Deepesh Garg
858fd6fce3 fix: Revert rate calculation 
(cherry picked from commit 6937a498e7)
 2022-03-25 07:31:36 +00:00
Deepesh Garg
f40c5cb681 fix: Add back calculation for discount 
(cherry picked from commit 067564bd26)
 2022-03-25 07:31:36 +00:00
Deepesh Garg
8ff47999ab fix: Rate change issue on save and mapping from other doc 
(cherry picked from commit 13fcda5776)
 2022-03-25 07:31:36 +00:00
Deepesh Garg
def18f2b13 fix: Condition 
(cherry picked from commit 2e0e6ca6b1)
 2022-03-25 07:31:08 +00:00
Deepesh Garg
6c23dea716 fix: Revert rate calculation 
(cherry picked from commit 6937a498e7)
 2022-03-25 07:31:08 +00:00
Deepesh Garg
4737cb10f3 fix: Add back calculation for discount 
(cherry picked from commit 067564bd26)
 2022-03-25 07:31:07 +00:00
Deepesh Garg
13e73f6a38 fix: Rate change issue on save and mapping from other doc 
(cherry picked from commit 13fcda5776)
 2022-03-25 07:31:07 +00:00
Deepesh Garg
26b90ffce0 Merge pull request #30406 from deepeshgarg007/rate_change_fixes 
fix: Rate change issue on save and mapping from other doc
 2022-03-25 12:59:40 +05:30
mergify[bot]
29fde6ee8b fix: failing broken patches (#30409) (#30412) 
* fix: failing broken patches

* refactor: simpler conditions

[skip ci]

(cherry picked from commit c4854bb1b1)

Co-authored-by: Shadrak Gurupnor <30501401+shadrak98@users.noreply.github.com>
 2022-03-25 12:57:05 +05:30
Deepesh Garg
2e0e6ca6b1 fix: Condition 2022-03-25 12:39:59 +05:30
Deepesh Garg
6937a498e7 fix: Revert rate calculation 2022-03-25 12:28:55 +05:30
Deepesh Garg
067564bd26 fix: Add back calculation for discount 2022-03-25 12:17:51 +05:30
Bhavesh Maheshwari
378d15d388 fix: process statement to_date override 2022-03-25 11:27:19 +05:30
Deepesh Garg
13fcda5776 fix: Rate change issue on save and mapping from other doc 2022-03-25 10:46:09 +05:30
Ankush Menat
20794ac9ce fix: consider all existing PO items 
When this is sent from API/client side doesn't send temporary_name it
can be flaky. Hence, use all available names for validation.
 2022-03-24 18:00:00 +05:30
mergify[bot]
03d7fc1570 fix: broken production item links on production plan (backport #30399) (#30400) 
* fix: only validate qty for main non-subassy items

(cherry picked from commit 3d43c437ad)

* fix: subassembly items linked to temporary name

Production Plan tables for po_items and sub_assembly_items are prepared
client side so both dont exist at time of first save or modifying and
hence any "links" created are invalid. This change retains temporary
name so it can be relinked server side after naming is performed.

Co-Authored-By: Marica <maricadsouza221197@gmail.com>
(cherry picked from commit 5b1d6055e6)

* test: dont resubmit WO

[skip ci]

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-24 17:30:58 +05:30
Deepesh Garg
d3fd2fd2c5 fix: Ignore for Purchase Invoices 2022-03-24 13:35:32 +05:30
Deepesh Garg
ed38679d22 fix: Ignore for Purchase Invoices 2022-03-24 13:09:55 +05:30
mergify[bot]
26fe2388e1 fix: (ux) Add is_group=0 filter on website warehouse (#30396) (#30397) 
- It does not support group warehouses right now and it is misleading

(cherry picked from commit d24458ab77)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-03-24 13:01:06 +05:30
Deepesh Garg
2e33e748ea fix: Client side changes for POS Write off amount 2022-03-24 12:56:22 +05:30
Deepesh Garg
ee4258e42c fix: Write off amount wrongly calculated in POS Invoice 2022-03-24 12:31:37 +05:30
Deepesh Garg
e63f20b3f7 Merge pull request #30389 from frappe/mergify/bp/version-13-hotfix/pr-30334 
fix: Reset GST State number (backport #30334)
 2022-03-24 10:11:13 +05:30
Deepesh Garg
cd20502c7e fix: Reset GST State number 
(cherry picked from commit 363e676a35)
 2022-03-23 18:00:47 +00:00
Deepesh Garg
aded1fca3e Merge pull request #30343 from deepeshgarg007/item_tax_template_bug 
fix: Taxes not getting fetched from item tax template
 2022-03-23 22:02:17 +05:30
Deepesh Garg
7cae669e81 fix(India): Auto tax fetching based on GSTIN 2022-03-23 18:47:58 +05:30
Ankush Menat
54e4ff19ee fix: make auto created job cards "Open" 
(cherry picked from commit 6418dc1606)
 2022-03-23 16:46:22 +05:30
Ankush Menat
ff38d0498b fix: material transfer status should be before WIP 
(cherry picked from commit e1f5620654)
 2022-03-23 16:46:22 +05:30
Ankush Menat
a1740b0762 fix: ignore items without info for pending qty computation 
(cherry picked from commit 4aa74af90d)
 2022-03-23 15:51:29 +05:30
Ankush Menat
277c03e157 chore(DX): add sourceURL for debugging 
(cherry picked from commit be16fb9dbb)
 2022-03-23 15:51:29 +05:30
Deepesh Garg
67b9f43330 Merge pull request #30367 from frappe/mergify/bp/version-13-hotfix/pr-30365 
fix: Changing item prices on converting orders/receipts to invoices (backport #30365)
 2022-03-23 14:27:22 +05:30
Deepesh Garg
a5b29c1722 Merge pull request #30373 from frappe/mergify/bp/version-13/pr-30368 
fix: Changing item prices on converting orders/receipts to invoices (backport #30365) (backport #30368)
v13.23.1 		2022-03-23 14:22:16 +05:30
Deepesh Garg
14ac2d39ab fix: Check if onload property exists in the form object 
(cherry picked from commit 41b2d98c3f)
 2022-03-23 08:48:17 +00:00
Deepesh Garg
740a9da1ee fix: Add ignore pricelist for missing flows 
(cherry picked from commit 405dcb1d3c)
(cherry picked from commit 7d3cdf527b)
 2022-03-23 08:48:17 +00:00
Deepesh Garg
c44231a432 fix: Changing item prices on converting orders/receipts to invoices 
(cherry picked from commit 66ca085e39)
(cherry picked from commit a9533ef814)
 2022-03-23 08:48:17 +00:00
Deepesh Garg
8fe9dbc75c Merge pull request #30368 from frappe/mergify/bp/version-13-pre-release/pr-30365 
fix: Changing item prices on converting orders/receipts to invoices (backport #30365)
 2022-03-23 14:17:56 +05:30
Deepesh Garg
a3f4069ad5 fix: Check if onload property exists in the form object 2022-03-23 13:58:21 +05:30
Deepesh Garg
41b2d98c3f fix: Check if onload property exists in the form object 2022-03-23 13:57:23 +05:30
Deepesh Garg
ebcd85e675 Merge pull request #30371 from frappe/mergify/bp/version-13-hotfix/pr-30361 
fix: GST account not showing up in tax templates (backport #30361)
 2022-03-23 13:42:44 +05:30
Deepesh Garg
0979ba0670 fix: GST account not showing up in tax templates 
(cherry picked from commit 57924599da)
 2022-03-23 07:47:52 +00:00
Deepesh Garg
7d3cdf527b fix: Add ignore pricelist for missing flows 
(cherry picked from commit 405dcb1d3c)
 2022-03-23 04:40:53 +00:00