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
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
Deepesh Garg
d05d15346a
fix: Conversion rate validation for multi-currency invoices
2022-06-14 12:50:49 +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
3469560105
refactor!: Accounts Controller
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
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
33d9767382
Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_currency_check
2022-05-12 16:40:29 +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
rahib-hassan
f3fa6ac4c2
fix: account setting seperation gl discount account creation
2022-04-20 16:01:12 +05:30
Ankush Menat
0d64349142
Merge branch 'develop' into separate-discount-account
2022-04-14 17:29:28 +05:30
rahib-hassan
01fde15bd5
fix: dependent codes updated
2022-04-14 15:48:55 +05:30
Deepesh Garg
e2fa9f708e
Merge pull request #30710 from deepeshgarg007/advance_jv_allocation
...
fix: Exchange gain and loss on advance Journal Entry allocation
2022-04-14 15:10:04 +05:30
Deepesh Garg
c38be53ce8
test: Update customer in Sales Invoice
2022-04-14 13:26:47 +05:30
Deepesh Garg
31883b699d
fix: Exchange gain and loss on advance jv allocation
2022-04-13 20:52:25 +05:30
Deepesh Garg
9bf5f76ac8
fix: Deferred Revenue/Expense Account validation
2022-04-06 17:33:46 +05:30
Sagar Sharma
d074c93ac7
refactor!: change "is_subcontracted" field type from "Select" to "Check"
2022-04-01 13:22:44 +05:30
Saqib Ansari
199a6da960
perf: skip warehouse validation for non-stock items
2022-03-31 11:41:52 +05:30
Saqib Ansari
6528218ac3
perf: skip warehouse validation for non-stock items
2022-03-29 18:43:33 +05:30
Ankush Menat
494bd9ef78
style: format code with black
2022-03-28 18:52:46 +05:30
Deepesh Garg
06936cf1c0
fix: Validate income/expense account in sales and purchase invoice
2022-03-16 09:02:04 +05:30
Deepesh Garg
a61790c00f
fix: Remove unintended changes
2022-02-22 20:58:10 +05:30
Deepesh Garg
5a2b571aa9
fix: Validate party account with company
2022-02-18 20:05:49 +05:30
Ankush Menat
c36bd7e1a6
fix: avoid creating bins without item-wh
...
Co-Authored-By: Shadrak Gurupnor <30501401+shadrak98@users.noreply.github.com>
Co-Authored-By: Saurabh <saurabh6790@gmail.com>
2022-02-17 19:52:01 +05:30
Saqib Ansari
ab36b27a94
fix: ignore pricing rule in all transactions
2022-02-09 10:10:17 +05:30
Saqib Ansari
4f4395545e
Merge branch 'develop' into fix-ignore-pricing-rule
2022-02-08 15:29:28 +05:30
Saqib Ansari
9432d8edd1
Merge branch 'develop' into bug_invoice_creation_throws_typeerror
2022-02-04 10:20:43 +05:30
Saqib Ansari
5a7236efcd
Merge branch 'develop' into fix-ignore-pricing-rule
2022-02-02 21:47:51 +05:30
ruthra kumar
9bd56b0f79
fix: typeerror on invoice creation from SO/PO
2022-02-01 14:14:04 +05:30
Saqib Ansari
c5782b0e71
revert: "refactor!: drop e-invoicing integration from erpnext ( #26940 )"
...
This reverts commit c335962827e4927f7ada084e9ba4ab2db15e3eb6.
2022-01-27 20:09:56 +05:30
Saqib Ansari
b8c41e3030
test: item price on remove pricing rule
2022-01-20 13:06:56 +05:30
Deepesh Garg
30a647ff80
fix: Handle frozen books while handling
2022-01-07 19:52:38 +05:30
Deepesh Garg
b83608b029
Merge pull request #28994 from nextchamp-saqib/zero-qty-debit-note
...
fix: cannot create debit note with zero qty
2022-01-07 18:35:24 +05:30
Ankush Menat
733c9defdf
fix: update idx after updating items in so/po ( #29134 )
2022-01-04 18:39:30 +05:30
Saqib Ansari
79ccf80faf
Merge branch 'develop' into zero-qty-debit-note
2021-12-29 17:32:16 +05:30
Pruthvi Patel
fc0dd3fcd7
Merge branch 'develop' into fix-invoice-statuses
2021-12-29 13:45:35 +05:45
Deepesh Garg
7ad149f9fe
fix: Start date validation for deferred invoices
2021-12-23 14:39:20 +05:30
Saqib Ansari
2be5104848
fix: cannot save debit note with zero quantity
2021-12-23 11:52:10 +05:30
Pruthvi Patel
16a90d3e60
Update erpnext/controllers/accounts_controller.py
...
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-12-20 13:24:19 +05:30
