Deepesh Garg
b741ae143c
fix: Reapply pricing rule on qty change
2022-12-02 17:14:06 +05:30
Deepesh Garg
bfb81ef56f
fix: Due date for month end payment term
2022-11-30 20:53:41 +05:30
Deepesh Garg
8287fb5104
Merge pull request #33143 from deepeshgarg007/auto_repeat_dates
...
fix: Auto repeat date validations
2022-11-29 09:28:19 +05:30
Deepesh Garg
6a47fb6c9e
chore: Update condition
2022-11-28 22:47:44 +05:30
Deepesh Garg
fa15221455
fix: Auto repeat date validations
2022-11-28 19:22:35 +05:30
Deepesh Garg
104fdcb9f9
fix: Dispatch address display
2022-11-24 16:41:40 +05:30
ruthra kumar
bf76b85dfd
fix: update advace paid in SO/PO in account currency
2022-11-22 12:33:18 +05:30
s-aga-r
8a73e963ce
fix: don't set rejected-qty in return SCR
2022-11-16 14:28:32 +05:30
s-aga-r
01f56c621c
Revert "fix: get consumed_qty based on received_qty in SCR"
...
This reverts commit 70c9b8dc50
2022-11-15 14:32:16 +05:30
Daizy Modi
4efc947f14
perf: use get_cached_value instead of db.get_value in controllers ( #32776 )
2022-11-07 09:21:03 +05:30
Sagar Sharma
70c9b8dc50
fix: get consumed_qty based on received_qty in SCR
2022-11-06 13:33:47 +05:30
Deepesh Garg
8d30ebb12b
fix: Disable tax included prices for internal transfers ( #32794 )
...
* fix: Disable tax-included prices for internal transfers
2022-11-05 20:51:15 +05:30
Sagar Sharma
5665d1afa0
Merge branch 'develop' into fix/scr/return
2022-11-05 16:36:07 +05:30
Deepesh Garg
4ff06a9d79
Merge pull request #32844 from deepeshgarg007/auto_allocate_advances
...
fix: Auto advance allocation against partial invoices
2022-11-05 16:27:59 +05:30
Sagar Sharma
324bfa9fde
test: fix test case
2022-11-05 16:18:31 +05:30
Sagar Sharma
760c26e9c0
fix: make BOM required in SCR Item
2022-11-05 15:52:14 +05:30
Sagar Sharma
54072ec9cd
fix: map BOM while mapping the return SCR
2022-11-05 15:51:29 +05:30
Deepesh Garg
181df2fe63
fix: Auto advance allocation against partial invoices
2022-11-04 15:49:37 +05:30
Deepesh Garg
cbf82872fb
Merge pull request #32646 from niralisatapara/tds_purchase_invoice
...
feat: Item Wise TDS Calculation
2022-11-04 13:08:10 +05:30
Rohit Waghchaure
b0fc568c80
fix: not able to select customer / supplier
2022-11-03 11:24:58 +05:30
niralisatapara
12456f9850
feat: item wise tds calculation
2022-11-03 10:46:30 +05:30
ruthra kumar
c3dc1c272b
Merge pull request #32816 from ruthra-kumar/advance_paid_in_so_and_po
...
fix: update advance paid in SO/PO from Payment Ledger
2022-11-02 16:27:56 +05:30
niralisatapara
2ca0cf6fc4
feat: item wise tds calculation
2022-11-02 12:19:51 +05:30
niralisatapara
4aff2a32ad
Merge branch 'develop' of https://github.com/niralisatapara/erpnext into develop
2022-11-02 11:21:02 +05:30
ruthra kumar
4487065b67
fix: update advance paid in SO/PO from Payment Ledger
2022-11-01 10:29:31 +05:30
Deepesh Garg
06e8e28531
fix: Mode of payment for returns in POS Sales Invoice
2022-10-31 19:58:46 +05:30
Rohit Waghchaure
5f84993bae
test: added test case to validate seachfields for customer, supplier
2022-10-24 16:10:47 +05:30
Rohit Waghchaure
46d148defd
fix: searchfield not working for cuctsomer, supplier as per customize form
2022-10-24 15:48:34 +05:30
Deepesh Garg
9aa5e20ef7
chore: check only for inter-company transfers
2022-10-12 15:53:28 +05:30
Deepesh Garg
49601558c6
chore: fix precision condition
2022-10-12 14:57:16 +05:30
Deepesh Garg
1c05c004cd
chore: Use proper accounts
2022-10-12 14:19:09 +05:30
Deepesh Garg
df2a0e265b
chore: GL Entries for SLE diff
2022-10-11 14:55:09 +05:30
Deepesh Garg
a14c5dbcc4
Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_precision_fixes
2022-10-10 15:08:15 +05:30
niralisatapara
e758a753f8
Item Wise TDS Calculation
...
For calculating Item wise TDS in Purchase Invoice.
2022-10-03 16:39:35 +05:30
Sagar Sharma
fa2290657a
fix: add validation for non-stock item in SCR
2022-09-30 16:18:15 +05:30
rohitwaghchaure
10b7592d14
Merge pull request #32414 from rohitwaghchaure/consider-searchfields-as-per-customize-form
...
fix: searchfields as per customize form not working for Item
2022-09-29 14:51:55 +05:30
Rohit Waghchaure
fd889fd29a
fix: searchfields as per customize form not working for Item
2022-09-28 23:00:45 +05:30
Sagar Sharma
a145d1065a
Merge branch 'develop' into fix/stock-entry/supplied-items
2022-09-28 16:55:57 +05:30
Sagar Sharma
ac7409bbf3
fix: supplied items added twice in Stock Entry
2022-09-28 16:46:48 +05:30
Nabin Hait
6145013f30
Merge branch 'develop' into fix_asset_scrap_and_sale_dep
2022-09-27 15:56:39 +05:30
Deepesh Garg
ce80b9fa0e
Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_precision_fixes
2022-09-26 21:16:25 +05:30
Deepesh Garg
6e47fd54a0
fix: Hanlde rounding loss for internal transfer
2022-09-26 21:15:57 +05:30
ruthra kumar
6e65f01ede
Merge pull request #32296 from ruthra-kumar/amount_in_words_for_debit_note
...
fix: get amount in words for debit note
2022-09-20 18:09:33 +05:30
ruthra kumar
70f6484d9d
fix: get amount in words for debit note
2022-09-20 17:32:23 +05:30
Sagar Sharma
3a9c08e7c9
fix: po_detail or sco_rm_detail not getting set while while mapping SE
2022-09-19 18:47:46 +05:30
Deepesh Garg
083309c056
fix: Incoming rate precision fixes for intra company transfer
2022-09-19 15:06:06 +05:30
rohitwaghchaure
3c01bf3a12
Merge pull request #32238 from rohitwaghchaure/fix-pricing-rules-issues
...
fix: suggestion threshold label and rule was not working for other item with min and max amount
2022-09-17 12:11:24 +05:30
Rohit Waghchaure
f5bd3fa952
fix: suggestion threshold label and rule was not working for other items with min and max amount
2022-09-16 16:03:08 +05:30
Nabin Hait
0d732609f0
Merge branch 'develop' into consider-posting-time-for-internal-po
2022-09-15 17:42:26 +05:30
anandbaburajan
ff5cad1cd6
fix: calculate depreciation properly on asset sale entry and scrap entry
2022-09-15 13:15:34 +05:30
Rohit Waghchaure
cb763938dc
fix: consider posting time for internal transfer PO
2022-09-15 11:48:43 +05:30
Nabin Hait
e24a4b18c4
Merge branch 'SaiFi0102-asset-capitalization' into develop
2022-09-13 15:00:21 +05:30
Raffael Meyer
e00ece7a78
fix: remove EmployeeBoardingController ( #32139 )
...
fix: remove employee boarding controller
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2022-09-13 02:00:04 +05:30
Deepesh Garg
6b94b5334c
Merge pull request #32144 from deepeshgarg007/internal_purchase_invoice_rate
...
fix: Rate for internal PI have non stock UOM items
2022-09-12 09:09:43 +05:30
ruthra kumar
4576c1ebc3
Merge pull request #32137 from ruthra-kumar/delete_payment_ledger_entries_on_src_doc_delete
...
refactor(minor): delete linked payment ledger entries on source doc deletion
2022-09-11 11:21:24 +05:30
ruthra kumar
70313df531
fix: delete linked payment ledger entries no source doc deletion
2022-09-10 09:30:45 +05:30
Nabin Hait
fefe95052d
fix: resolved merge conflict
2022-09-09 14:40:36 +05:30
Deepesh Garg
0f655e4430
fix: Rate for internal PI have non stock UOM items
2022-09-09 12:40:57 +05:30
Sagar Sharma
ccb2889cac
fix: SCO Supplied Items returned-qty
2022-09-08 18:15:45 +05:30
Sagar Sharma
f19049e643
Merge branch 'develop' into fix/subcontracting-receipt/gl-entries
2022-09-07 14:55:56 +05:30
Rohit Waghchaure
b4a102d119
fix: internal transfer flow
2022-09-07 12:48:18 +05:30
Sagar Sharma
008542b715
fix: AD not getting copied from SCO while creating a Material Transfer ( #32106 )
2022-09-07 10:15:43 +05:30
rohitwaghchaure
c6380a25d6
Merge pull request #32063 from rohitwaghchaure/fixed-fetch-from-parent
...
fix: inventory dimension issues
2022-09-06 10:45:36 +05:30
Rohit Waghchaure
75fcab04b1
test: test cases for PI and DN
2022-09-06 01:42:57 +05:30
Deepesh Garg
1a61d4e8a8
Merge branch 'develop' into fix-consolidation-precision-error
2022-09-04 13:18:10 +05:30
Rohit Waghchaure
237299948a
fix: fetch from parent not working for custom field
2022-09-03 17:27:00 +05:30
Deepesh Garg
318da16b99
fix: Rounded total for cash and non trade discount invoices
2022-08-29 14:18:39 +05:30
Deepesh Garg
e9b0c7177f
Merge branch 'develop' into fix-consolidation-precision-error
2022-08-25 11:41:20 +05:30
Deepesh Garg
9fd0c25c9f
Merge pull request #31910 from deepeshgarg007/cash_and_non_trade_discount_fix
...
fix: Cash and non trade discount calculation
2022-08-23 10:19:09 +05:30
Sagar Sharma
2effbb55ae
test: Add test case for Subcontracting Receipt GL Entries
2022-08-22 22:14:56 +05:30
Deepesh Garg
ae3dce0cbd
fix: Test cases
2022-08-22 08:57:58 +05:30
Sagar Sharma
f4673941e0
chore: move function "add_gl_entry" from purchase_receipt.py to stock_controller.py
2022-08-21 21:26:06 +05:30
Deepesh Garg
3b15966cc9
fix: Cash and non trade discount calculation
2022-08-21 17:51:05 +05:30
Sagar Sharma
c247cf728c
chore: add test for additional-cost
2022-08-19 11:46:36 +05:30
Sagar Sharma
addd7347d8
fix: test "test_pending_and_received_qty"
2022-08-19 11:46:27 +05:30
Sagar Sharma
ea82fe5bc2
chore: move "set_missing_values_in_additional_costs" from SCO to SC"
2022-08-18 17:20:22 +05:30
Sagar Sharma
2d04e71412
fix: Make expense account editable in Subcontracting Receipt Item ( #31848 )
2022-08-17 15:57:41 +05:30
rohitwaghchaure
396667b702
Merge pull request #31860 from rohitwaghchaure/delete-custom-fields-on-dimension-delete
...
fix: delete custom fields on deletion of inventory dimension
2022-08-17 15:43:54 +05:30
Rohit Waghchaure
0b39a0123e
fix: delete custom fields on deletion of inventory dimension
2022-08-17 14:55:02 +05:30
rohitwaghchaure
dd08045f28
Merge pull request #31863 from rohitwaghchaure/allow-to-make-material-issue
...
fix: not able to issue expired batches
2022-08-17 14:45:14 +05:30
Rohit Waghchaure
795c94384a
fix: not able to issue expired batches
2022-08-17 14:03:55 +05:30
Saqib Ansari
33762dbbac
fix(pos): error while consolidating pos invoices
2022-08-10 14:17:28 +05:30
rohitwaghchaure
e93a1cc02e
Merge pull request #31804 from rohitwaghchaure/fixed-incorret-incoming-rate-for-internal-suppliier
...
fix: incorrect incoming rate set for inter transfer purchase receipt
2022-08-09 16:00:31 +05:30
Rohit Waghchaure
ddd24ea8c8
fix: incorrect incoming rate set for inter transfer purchase receipt
2022-08-09 14:50:20 +05:30
Sagar Vora
a3625b3817
fix: set billing_address for purchases in get_party_details
2022-08-08 06:04:10 +00:00
Sagar Vora
9baa222976
fix: specify allowed doctype in queries ( #31761 )
2022-08-03 11:12:30 +05:30
mergify[bot]
89f516c32b
fix: assign duplicate_items_msg outside conditional (backport #31639 ) ( #31650 )
...
fix: assign duplicate_items_msg outside conditional (#31639 )
duplicate_items_msg was defined inside if the statement of stock_item so when duplicate was found in non_stock_item it raised referenced before assignment
(cherry picked from commit 8e23c6ad69dee213f0252d2b231317490fab760f)
Co-authored-by: Maharshi Patel <39730881+maharshivpatel@users.noreply.github.com>
2022-07-21 13:57:03 +05:30
rohitwaghchaure
5a3999e236
Merge pull request #31424 from rohitwaghchaure/feat-inventory-dimension
...
feat: Inventory Dimension
2022-07-20 19:47:14 +05:30
Rohit Waghchaure
289e6cd4ce
fix: change frappe.db.sql to frappe.qb
2022-07-20 16:02:13 +05:30
Rohit Waghchaure
e576f7f07e
test: test cases for inventory dimension
2022-07-20 16:02:13 +05:30
Rohit Waghchaure
dbec5cff00
feat: Inventory Dimension
2022-07-20 16:02:13 +05:30
Rucha Mahabal
d8aa1c59f1
Merge branch 'develop' into hr-separation
2022-07-12 19:27:19 +05:30
Deepesh Garg
0b822dade0
Merge pull request #31566 from deepeshgarg007/ignore_account_currency
...
fix: Allow multi currency invoice against single party account
2022-07-11 21:14:02 +05:30
Deepesh Garg
e04e67c6bf
chore: fix query
2022-07-11 19:25:18 +05:30
Deepesh Garg
3cf609fab1
chore: Ignore validation
2022-07-11 13:46:59 +05:30
Rucha Mahabal
ef02e58859
Merge branch 'develop' into hr-separation
2022-07-07 13:46:54 +05:30
Sagar Sharma
f9885746a8
Merge branch 'develop' into subcontracting
2022-07-07 09:56:23 +05:30
marination
aa043fe961
fix: Use fallback conversion factor while setting incoming rate for petty purchase
...
- PIs for petty items (that do not need an Item record) are allowed using Item Name field
- If a different UOM is used in this case, conversion factor stays 0 and causes an error
- Fallback to 1 in `set_incoming_rate` for buying
- Selling will need a proper item, so this change is not needed there
2022-07-05 19:43:02 +05:30
Sagar Sharma
f75d35ed60
Merge branch 'develop' into subcontracting
2022-07-05 11:25:08 +05:30
Deepesh Garg
e54ec4b9b6
chore: use get instead of . operator
2022-07-03 11:02:21 +05:30
Deepesh Garg
b4f6429e32
Merge branch 'develop' of https://github.com/frappe/erpnext into e_invoice_discounts
2022-07-02 18:42:31 +05:30
Sagar Sharma
fd162f9b14
fix: supplier warehouse in PR
2022-07-01 16:51:19 +05:30
Sagar Sharma
78ff1783b1
Merge branch 'develop' into subcontracting
2022-06-28 22:20:32 +05:30
Rucha Mahabal
6a65c8aff4
Merge branch 'develop' into hr-separation
2022-06-28 11:51:59 +05:30
Ankush Menat
dd11f26eba
fix: dont update RM items table if not required ( #31408 )
...
Currently on PO update RM item table is auto computed again and again,
if there was any transfer/consumption against that then it will be lost.
This change:
1. Disables updating RM table if no change in qty of FG was made. Since
RM table can't possibly be different with same FG qty.
2. Blocks update completely if qty is changed and RM items are already
transferred.
2022-06-27 15:55:08 +05:30
Deepesh Garg
f572c20009
Merge branch 'develop' into internal_trasfer_precision_loss
2022-06-21 10:45:02 +05:30
s-aga-r
f6ef3068d7
Merge branch 'develop' into subcontracting
2022-06-20 23:10:31 +05:30
s-aga-r
6d89b2fa28
refactor: backport old subcontracting code
2022-06-20 23:10:02 +05:30
Deepesh Garg
46e6c2cd0f
Merge branch 'develop' of https://github.com/frappe/erpnext into sales_exchange_rate_validation
2022-06-20 22:00:49 +05:30
Deepesh Garg
169ff5a0dd
feat: Cash and Non trade discounts in Sales Invoice
2022-06-19 21:18:12 +05:30
Conor
ea28ed1bb3
refactor: if() to CASE WHEN ( #31360 )
...
* refactor: if() to CASE WHEN
* fix: remove duplicate order by
* fix: remove extraneous table
* style: reformat to black spec
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-17 21:17:48 +05:30
Conor
74a782d81d
refactor: DB independent quoting and truthy/falsy values ( #31358 )
...
* refactor: DB independent quoting and truthy/falsy values
* style: reformat to black spec
* fix: ifnull -> coalesce
* fix: coalesce -> Coalesce
* fix: revert pypika comparison
* refactor: convert queries to QB
* fix: incorrect value types for query
`=` query makes no sense with list of values
* fix: remove warehouse docstatus condition
* fix: keep using base rate as rate
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-17 17:01:27 +05:30
Ankush Menat
10583eb3ce
fix: UOM handling for transaction without item ( #31389 )
...
If invoice is made without item code then UOM, Stock UOM and
conversion_factor all need to be manually added, this is confusing and
leads missing them out leads to errors.
Simplest solution:
- if either UOM exists then set both to same uom conversion factor to
- also set conversion factor based on UOM conversions
2022-06-17 12:13:27 +05:30
Rucha Mahabal
3fe2ef6790
chore: update import paths for HR
2022-06-15 12:43:45 +05:30
Conor
b8f728a40a
refactor: use CURRENT_DATE instead of CURDATE() ( #31356 )
...
* refactor: use CURRENT_DATE instead of CURDATE()
* style: reformat to black spec
* refactor: use QB for auto_close queries
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-15 12:07:33 +05:30
s-aga-r
9a68af36ec
Merge branch 'develop' into subcontracting
2022-06-14 19:13:10 +05:30
Deepesh Garg
d05d15346a
fix: Conversion rate validation for multi-currency invoices
2022-06-14 12:50:49 +05:30
Deepesh Garg
5b2ba087a3
Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_issues
2022-06-14 10:50:47 +05:30
Conor
00ef499739
refactor: use db independent offset syntax ( #31345 )
...
* chore: use db independent offset syntax
* fix: typo
* style: reformat code to black spec
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-14 10:49:07 +05:30
Deepesh Garg
118c786e63
fix: Partially Ordered status for quotation
2022-06-11 21:55:59 +05:30
Rucha Mahabal
512c82f76d
chore: Update imports/paths for doctypes moved to erpnext setup module
2022-06-10 15:06:54 +05:30
Ankush Menat
65b21ee7d6
fix: internal transfer GLE validation
2022-06-08 19:26:40 +05:30
Sagar Sharma
f7a52f76d4
Merge branch 'develop' into subcontracting
2022-06-08 04:27:24 -07:00
Ankush Menat
7726271e2a
fix: purchase invoice return GLe
...
voucher_wise_stock_value contains tuples and the condition was looking
for string, so it's never triggered.
Caused by https://github.com/frappe/erpnext/pull/24200
2022-06-07 12:08:20 +05:30
Sagar Sharma
74fae72939
Merge branch 'develop' into subcontracting
2022-06-06 10:27:25 +05:30
s-aga-r
992ba974e2
Merge branch 'develop' into subcontracting
2022-06-03 13:25:49 +05:30
Devin Slauenwhite
b061ea4cd2
chore: linter
2022-06-02 14:23:54 -04:00
Devin Slauenwhite
3a1c923e76
fix: display currencies in validation message.
2022-06-02 14:15:50 -04:00
Ankush Menat
77dcdff0db
fix: unusable SO after clearing taxes ( #31215 )
2022-06-01 22:01:07 +05:30
Ankush Menat
c84e11ac82
fix: re-validate warehouse after 'update items' ( #31203 )
2022-06-01 12:55:10 +05:30
Sagar Sharma
bcaac8f90f
Merge branch 'develop' into subcontracting
2022-05-26 15:01:23 +05:30
Deepesh Garg
ac17ecb84b
Merge branch 'develop' into party_account_currency_check
2022-05-25 16:21:06 +05:30
Sagar Sharma
213113bc00
Merge branch 'develop' into subcontracting
2022-05-20 12:13:13 +05:30
Sagar Sharma
e9b28452e4
feat: SCR return
2022-05-20 10:45:34 +05:30
Sagar Sharma
3469560105
refactor!: Accounts Controller
2022-05-20 10:45:33 +05:30
Sagar Sharma
34bda14b5b
refactor!: Buying Controller
2022-05-20 10:45:33 +05:30
Sagar Sharma
574181f3d7
test: SubcontractingController
2022-05-20 10:45:33 +05:30
Sagar Sharma
70a1f40624
feat: New DocType "Subcontracting Receipt"
2022-05-20 10:45:33 +05:30
Sagar Sharma
409df263e8
refactor!: change "is_subcontracted" field type from "Select" to "Check"
2022-05-20 10:45:33 +05:30
Sagar Sharma
249726b845
feat: New DocType "Subcontracting Order"
2022-05-20 10:45:33 +05:30
Sagar Sharma
29a1cb89c2
feat: SubcontractingController
2022-05-20 10:45:33 +05:30
Sagar Sharma
77db843692
refactor!: Make required changes to create SCO from PO
2022-05-20 10:45:30 +05:30
Saqib Ansari
f915a9cef7
fix: discount ledger entry in case of multicurrency invoice ( #31024 )
2022-05-17 11:22:01 +05:30
Ankush Menat
3714e36b44
fix: disable pricing rules for internal transfers ( #31034 )
...
* fix: disable pricing rules for internal transfers
* fix: only apply validation on internal transfers
Co-authored-by: Marica <maricadsouza221197@gmail.com>
* fix: internal_party_field undefined
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2022-05-16 18:09:14 +05:30
Deepesh Garg
34de20f6ee
Merge pull request #30987 from ankush/internal_transfer_with_margin
...
fix: prevent bypassing forced valuation rate
2022-05-15 20:49:55 +05:30
Saqib Ansari
319c858d63
Merge pull request #30968 from nextchamp-saqib/validate-on-hold-invs
...
fix(accounts): minor fixes & validations
2022-05-12 22:06:35 +05:30
Ankush Menat
ee0a277540
fix: prevent bypassing forced valuation rate
...
if you edit "margin_rate_or_amount" after saving DN then based on
selected margin the rate gets updated which isn't valuation rate.
2022-05-12 19:01:26 +05:30
Deepesh Garg
33d9767382
Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_currency_check
2022-05-12 16:40:29 +05:30
Saqib Ansari
a1e3ae8869
fix: user can select disabled accounts in taxes table
2022-05-11 13:01:06 +05:30
marination
0c9154389b
fix: Block 0 Qty via Update Items to be consistent with form validation
2022-05-10 18:09:07 +05:30
