nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-28 22:28:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,679 Commits 619 Branches 1,804 Tags
71496a56ae9106a4ecd68ace9032dd75a54dd2e6
Commit Graph

33640 Commits

Author SHA1 Message Date
Deepesh Garg
71496a56ae Merge pull request #33376 from frappe/mergify/bp/version-14-hotfix/pr-33341 
fix: Cost Center for tax withholding invoices (backport #33341)
 2022-12-17 21:13:07 +05:30
barredterra
7ff50b9446 feat: improve visibility of default values 
(cherry picked from commit 8717148d9b)
 2022-12-17 13:55:47 +00:00
barredterra
07cda0aeb5 feat: more control when printing RFQ 
(cherry picked from commit ce9626fead)
 2022-12-17 13:55:47 +00:00
Deepesh Garg
4ea930a9e5 chore: resolve errors in test 
(cherry picked from commit 26277cfcf3)
 2022-12-17 13:55:15 +00:00
Deepesh Garg
728643aa4a fix: Cost Center for tax withholding invoices 
(cherry picked from commit 973ef33eb5)
 2022-12-17 13:55:15 +00:00
Deepesh Garg
f8c09ee720 fix: Unable to import COA through importer 
(cherry picked from commit 3b66920342)
 2022-12-17 11:13:07 +00:00
Devin Slauenwhite
4a8a84d6f0 fix: use highest precision for exchange rate. 
(cherry picked from commit 2010b1b6e8)
 2022-12-16 10:14:23 +00:00
Deepesh Garg
6f16cfa4ca Merge pull request #33366 from frappe/mergify/bp/version-14-hotfix/pr-33362 
feat: Ignore company related doctype for other apps via hooks (backport #33362)
 2022-12-16 12:30:50 +05:30
Deepesh Garg
cd5a2af272 feat: Ignore company related doctype for other apps via hooks 
(cherry picked from commit 1a40c04b72)
 2022-12-16 05:38:27 +00:00
Rohit Waghchaure
493509e42d fix: disabled items showing in the report 'Itemwise Recommended Reorder Level 
'

(cherry picked from commit ae31ff1c48)
 2022-12-15 12:38:53 +00:00
Rohit Waghchaure
7bdfb3d181 fix: unsupported operand type(s) for +: 'int' and 'NoneType' 
(cherry picked from commit 0f28074e5a)
 2022-12-15 11:44:34 +00:00
ruthra kumar
7d1ec5af39 test: cost center should not affect outstanding calculation 
(cherry picked from commit a998a8a2da)
 2022-12-15 09:33:07 +00:00
ruthra kumar
ff61997d25 fix: cost_center filter fix for 'Get Outstanding Invoice' in PE 
(cherry picked from commit 8eb93004f7)
 2022-12-15 09:33:07 +00:00
ruthra kumar
9b2b2812ca fix: cost_center filter gives incorrect output 
filtering on cost center gives invoices that are reconciled as having outstanding

(cherry picked from commit 6d9d730759)
 2022-12-15 09:33:07 +00:00
Deepesh Garg
83ba5c5fb1 chore: resolve conflicts 2022-12-15 12:28:11 +05:30
barredterra
bfe57acdbf feat: incoterm named place 
(cherry picked from commit e057e1dfe7)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 2022-12-15 06:30:37 +00:00
barredterra
43f990f5e8 refactor: translatable strings and guard clause 
(cherry picked from commit f20370c5ef)
 2022-12-15 03:52:17 +00:00
barredterra
ba51d50fef fix: translation for warning on Overbilling/-receipt/-delivery 
(cherry picked from commit 36997d9788)
 2022-12-14 17:55:04 +00:00
Rohit Waghchaure
bddb5b8d25 fix: get_serial_nos_for_fg() missing 1 required positional argument: 'args' 
(cherry picked from commit 410a58b3de)
 2022-12-14 10:38:16 +00:00
Sagar Sharma
4059b768f6 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-33314 2022-12-13 15:24:41 +05:30
Sabu Siyad
afbd48f26e fix(pos): variable typo: s_pos -> is_pos 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
(cherry picked from commit 7d64bf78cf)
 2022-12-13 09:52:15 +00:00
s-aga-r
3b9e9d2c6e fix: Enough Parts to Build in BOM Stock Report 
(cherry picked from commit 723c64ba73)
 2022-12-13 09:50:01 +00:00
Nabin Hait
00ce3382b8 Merge pull request #33316 from frappe/mergify/bp/version-14-hotfix/pr-33313 
fix: Permission issue in Tax Detail report (backport #33313)
 2022-12-13 15:15:35 +05:30
Nabin Hait
7a5b80dfbc fix: Permission issue in Tax Detail report 
(cherry picked from commit aa787e4030)
 2022-12-13 08:58:29 +00:00
Anand Baburajan
db36ddc7c0 Merge branch 'version-14-hotfix' into handle_post_depr_entries_fail 2022-12-13 14:09:11 +05:30
ruthra kumar
dbd0d560a8 Merge pull request #33311 from frappe/mergify/bp/version-14-hotfix/pr-33303 
fix: incorrect balance on parent company on consolidate Balance sheet due to key mismatch (backport #33303)
 2022-12-13 13:45:41 +05:30
rohitwaghchaure
d707528113 Merge pull request #33301 from frappe/mergify/bp/version-14-hotfix/pr-33281 
fix: maintain same rate throughout sales cycle doesn't work with quotation (backport #33281)
 2022-12-13 10:59:11 +05:30
ruthra kumar
436e93c129 fix: incorrect balance on parent company due to key mismatch 
(cherry picked from commit 7b3316dc31)
 2022-12-13 03:37:05 +00:00
s-aga-r
416d178209 fix: Material Request reference in internal Sales Order 
(cherry picked from commit 78b438f6cf)
 2022-12-12 18:18:53 +00:00
Tunde Akinyanmi
5d410f114a test: refactor test case 
(cherry picked from commit 71aa8c5e1c)
 2022-12-12 14:10:04 +00:00
Tunde Akinyanmi
1b94200ab7 test: ensure test case sets Selling Settings 
(cherry picked from commit d193a14b8f)
 2022-12-12 14:10:04 +00:00
Tunde Akinyanmi
5398cf8f22 fix: Maintain Same Rate Throughout Sales Cycle doesn't work 
Issue #29976 was partly fixed by #32923 but the problem still persists.
The reason is because an incorrect fieldname was passed to the
`validate_rate_with_reference_doc` method.
This commit fixes it

(cherry picked from commit 97ddfcfc7c)
 2022-12-12 14:10:03 +00:00
Anand Baburajan
7a7325fd90 Merge branch 'version-14-hotfix' into handle_post_depr_entries_fail 2022-12-12 16:36:19 +05:30
mergify[bot]
ce63086813 perf: add indexes on payment entry reference (backport #33288) (#33289) 
perf: add indexes on payment entry reference (#33288)

Adds index on:
1. reference doctype
2. reference name

*Why not composite index?*

There are three type of queries on this doctype

- filtering ref_doctype - doctype index helps here
- filtering ref_name - name index helps here
- filtering both - name index helps here too. Since it has sufficiently
  high cardinality. Composite index wont help in case where ref_doctype
  isn't specfied.

[skip ci]

(cherry picked from commit 593626f502)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-12-12 13:02:23 +05:30
Anand Baburajan
92ed9fdd03 Merge branch 'version-14-hotfix' into handle_post_depr_entries_fail 2022-12-08 21:26:27 +05:30
rohitwaghchaure
52e07da535 Merge pull request #33262 from frappe/mergify/bp/version-14-hotfix/pr-33258 
fix: total value in Warehouse Wise Stock Balance (backport #33258)
 2022-12-08 21:14:29 +05:30
Anand Baburajan
9b5620c838 Merge branch 'version-14-hotfix' into handle_post_depr_entries_fail 2022-12-08 21:04:32 +05:30
anandbaburajan
4fbf65dd57 chore: use frappe.db.set_value instead of asset.save 2022-12-08 21:04:08 +05:30
Deepesh Garg
ad03355333 chore: Update tests 
(cherry picked from commit 6192af5cf0)
 2022-12-08 13:12:32 +00:00
Deepesh Garg
5e5937d6d0 fix: Remove free items 
(cherry picked from commit 0581000990)
 2022-12-08 13:12:31 +00:00
Deepesh Garg
033b2a4825 chore: Add POS Invoices 
(cherry picked from commit 5f821b93a5)
 2022-12-08 13:12:31 +00:00
Deepesh Garg
c726c16702 fix: Reapply pricing rule on qty change 
(cherry picked from commit b741ae143c)
 2022-12-08 13:12:30 +00:00
Deepesh Garg
f5205a5b5d fix: Buying and selling check in pricing rule 
(cherry picked from commit f54838ab56)
 2022-12-08 13:12:30 +00:00
Deepesh Garg
b0cccaff01 Merge pull request #33266 from frappe/mergify/bp/version-14-hotfix/pr-33227 
fix: add translation variable index (backport #33227)
 2022-12-08 18:06:37 +05:30
Sabu Siyad
40621b99c8 fix(ecommerce): remove query parameters from referer 
inclusion of query parameters results in logic failure

example:
- logic check if referrer is `all-products`
- `http://shop.example/all-products` -> `all-products`, valid outcome
- `http://shop.example/all-products?start=1` -> `all-products?start=1`,
  invalid outcome

Signed-off-by: Sabu Siyad <hello@ssiyad.com>
(cherry picked from commit b6bd408f19)
 2022-12-08 11:42:24 +00:00
barredterra
ef933a8231 fix: add translation variable order 
(cherry picked from commit 748c74ba52)
 2022-12-08 09:47:56 +00:00
ruthra kumar
02cc618a1f fix: index error on customer master 
(cherry picked from commit cf1e3dc8ea)
 2022-12-08 07:23:13 +00:00
Rohit Waghchaure
c5a54d7912 fix: total value in Warehouse Wise Stock Balance 
(cherry picked from commit f598da7c81)
 2022-12-08 04:43:59 +00:00
anandbaburajan
bb66b64b94 chore: styling 2022-12-08 01:35:10 +05:30
Anand Baburajan
c35e352b3b Merge branch 'version-14-hotfix' into handle_post_depr_entries_fail 2022-12-08 01:29:43 +05:30