nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-02 13:08:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,990 Commits 455 Branches 1,744 Tags
7a2729e5bb3c5d4a30008aa6001ab75669bfe502
Commit Graph

39990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ankush Menat
7a2729e5bb Merge branch 'version-13-hotfix' into version-13-pre-release 2022-03-29 18:41:22 +05:30
mergify[bot]
39ff7b0b06 fix: validate 0 transfer qty in stock entry (#30476) (#30479) 
(cherry picked from commit b80fac03af)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-29 18:18:13 +05:30
Ankush Menat
eedfee367c Merge pull request #30478 from ankush/format_v13 
style: bulk formatting (v13 port)
 2022-03-29 17:51:30 +05:30
Ankush Menat
14c8386040 chore: ignore black formatting commit in blame 2022-03-29 17:31:43 +05:30
Ankush Menat
c07713b860 style: bulk format code with black 
v13 port because otherwise backports will result in conflicts always
 2022-03-29 17:29:34 +05:30
Ankush Menat
7cc84dcbb4 ci: pin click for black (#30464) 
[skip ci]
 2022-03-29 17:26:42 +05:30
Ankush Menat
68ded18a23 ci: force black formatting (pre-commit) 2022-03-29 17:26:26 +05:30
mergify[bot]
00ad515ac7 fix: use name for links not item_code (backport #30462) (#30463) 
* fix: use `name` for links not `item_code` (#30462)

(cherry picked from commit 76dce2eddc)

# Conflicts:
#	erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py

* fix: conflicts

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-29 17:16:31 +05:30
mergify[bot]
6b3bdb2e9e fix: dont check for failed repost while freezing (backport #30472) (#30473) 
* fix: dont check for failed repost while freezing (#30472)

[skip ci]

(cherry picked from commit b12fe0f15b)

# Conflicts:
#	erpnext/stock/utils.py

* fix: conflicts

[skip ci]

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-29 13:56:15 +05:30
Deepesh Garg
4ee08e390a Merge pull request #30460 from frappe/mergify/bp/version-13-pre-release/pr-30385 
fix(India): Auto tax fetching based on GSTIN (backport #30385)
 2022-03-29 12:32:10 +05:30
Deepesh Garg
504f213742 fix: Resolve conflicts 2022-03-29 10:35:44 +05:30
Deepesh Garg
3ff77f9cb3 fix(India): Auto tax fetching based on GSTIN 
(cherry picked from commit 7cae669e81)

# Conflicts:
#	erpnext/patches.txt
 2022-03-29 04:57:17 +00:00
Deepesh Garg
8e59e67197 Merge pull request #30385 from deepeshgarg007/quotation_gst 
fix(India): Auto tax fetching based on GSTIN
 2022-03-29 10:25:57 +05:30
mergify[bot]
659fa7a190 fix: bom valuation - handle lack of LPP (#30454) (#30457) 
(cherry picked from commit 8dff4d66a4)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-28 18:36:12 +05:30
Raffael Meyer
471a3279b9 fix(lead): reload address and contact before updating their links (Backport #29966) (#29968) 
* fix(lead): reload address and contact before updating their links

They might have changed since they were created. Backport of #29966.

* refactor: reload contact after insert
 2022-03-28 18:01:00 +05:30
Deepesh Garg
ea2b0e224e Merge pull request #30451 from frappe/version-13-hotfix 
chore: Pre release for v13.24.0
 2022-03-28 16:59:18 +05:30
Ankush Menat
7f3651a938 fix: update picked qty on cancellation 
(cherry picked from commit 69ae2661d2)
 2022-03-28 10:44:53 +05:30
Deepesh Garg
8fb56d57bb Merge pull request #30438 from deepeshgarg007/amount_to_pay 
fix: Incorrect default amount to pay for POS invoices
 2022-03-27 18:00:42 +05:30
Deepesh Garg
156416bcc3 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into quotation_gst 2022-03-27 17:28:42 +05:30
Deepesh Garg
a044e92687 fix: Incorrect default amount to pay for POS invoices 2022-03-27 13:02:31 +05:30
Saqib Ansari
99dc1ecd2d Merge pull request #30435 from frappe/mergify/bp/version-13-hotfix/pr-30420 
fix: unsupported operand type(s) for +=: 'int' and 'NoneType' (backport #30420)
 2022-03-26 20:00:07 +05:30
Saqib Ansari
bd171fbd42 fix: unsupported operand type(s) for +=: 'int' and 'NoneType' 
(cherry picked from commit 5450542fdb)
 2022-03-26 13:46:24 +00:00
Rucha Mahabal
020a4269ae fix(Expense Claim): validate advances after setting totals 2022-03-25 23:43:46 +05:30
Rucha Mahabal
84de986c5a fix(test): add function for getting advances for claim 2022-03-25 23:43:46 +05:30
Rucha Mahabal
e783e3f93e fix: do not update status to Paid if sanctioned amount is 0 2022-03-25 23:43:46 +05:30
Rucha Mahabal
ed0a685e0e chore: sort imports 2022-03-25 23:43:46 +05:30
Rucha Mahabal
7d3c211b1f test: expense claim against fully and partially paid advances 2022-03-25 23:43:46 +05:30
Rucha Mahabal
961e691bdc fix: Expense Claim conditions for Paid status 
- status doesn't change to Paid if the entire required amount is already covered via linked advances

- status doesn't change to Paid if the claim is partially paid via advances

- patch to update such uncancelled claims to Paid
 2022-03-25 23:43:46 +05:30
Deepesh Garg
d6703cef55 Merge pull request #30431 from frappe/mergify/bp/version-13-pre-release/pr-30429 
fix: Check for onload property (backport #30429)
 2022-03-25 21:55:20 +05:30
Deepesh Garg
071064c097 fix: Check for onload property 
(cherry picked from commit 71402b43a7)
 2022-03-25 16:24:02 +00:00
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
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
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
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