Deepesh Garg
|
310f71c313
|
test: Add static posting dates to tests
|
2023-03-05 18:43:26 +05:30 |
|
Deepesh Garg
|
4a2046dfb6
|
fix: Aggregation with previous closing balance
|
2023-03-05 18:18:33 +05:30 |
|
barredterra
|
502a37a864
|
refactor: use renamed timezone utils
https://github.com/frappe/frappe/pull/20253
|
2023-03-04 19:31:40 +01:00 |
|
Sagar Sharma
|
ac87fca0d7
|
Merge pull request #34299 from s-aga-r/fix-22-23-05638-2
fix: Stock Reconciliation `actual_qty`
|
2023-03-04 17:35:05 +05:30 |
|
s-aga-r
|
70de444b7b
|
fix: Stock Reconciliation actual_qty
|
2023-03-04 17:06:07 +05:30 |
|
Sagar Sharma
|
0185096e09
|
Merge pull request #34298 from s-aga-r/fix-22-23-05638-1
fix: update inventory dimensions before returning sle
|
2023-03-04 16:50:55 +05:30 |
|
s-aga-r
|
e6a02719f7
|
fix: update inventory dimensions before returning sle
|
2023-03-04 16:02:50 +05:30 |
|
Sagar Sharma
|
31ed4ef6d6
|
Merge pull request #34293 from s-aga-r/fix-22-23-05638
fix: `Inventory Dimension` for `Stock Reconciliation`
|
2023-03-04 02:13:13 +05:30 |
|
s-aga-r
|
0e1b7760a8
|
fix: Inventory Dimension for Stock Reconciliation
|
2023-03-04 01:05:55 +05:30 |
|
s-aga-r
|
53701c37b1
|
feat: consider over_order_allowance while validating sales order qty
|
2023-03-03 22:03:54 +05:30 |
|
s-aga-r
|
d7da8928ac
|
feat: add field Over Order Allowance (%) in Selling Settings
|
2023-03-03 11:19:28 +05:30 |
|
s-aga-r
|
8bcbc45add
|
feat: consider over_order_allowance while validating order qty
|
2023-03-03 11:11:33 +05:30 |
|
s-aga-r
|
fc1088d9c4
|
fix: don't map item row having 0 qty
|
2023-03-03 10:50:17 +05:30 |
|
s-aga-r
|
f3993783a3
|
refactor: rewrite blanket_order.py queries in QB
|
2023-03-02 17:18:46 +05:30 |
|
s-aga-r
|
f5937f46cb
|
feat: add field Over Order Allowance (%) in Buying Settings
|
2023-03-02 17:04:09 +05:30 |
|
Deepesh Garg
|
c3d455653e
|
Merge pull request #34258 from deepeshgarg007/finance_book_read_only
chore: Make finance book read only
|
2023-03-02 16:47:47 +05:30 |
|
Deepesh Garg
|
c089c4156c
|
chore: Minor fixes
|
2023-03-02 16:46:56 +05:30 |
|
s-aga-r
|
abf9a28d6a
|
fix: hide + button based on Blanket Order Type
|
2023-03-02 16:40:37 +05:30 |
|
Sagar Sharma
|
6e43d6882a
|
Merge pull request #34117 from s-aga-r/github-issue-33344
refactor: rewrite `get_item_details.py` queries in `QB`
|
2023-03-02 14:54:58 +05:30 |
|
Sagar Sharma
|
90e1a6bc16
|
Merge branch 'develop' into github-issue-33344
|
2023-03-02 14:24:14 +05:30 |
|
Sagar Sharma
|
310643d215
|
Merge pull request #34273 from s-aga-r/fix-return-pr-serial-no
fix: `rejected_serial_no` not getting copied from PR to PR(Return)
|
2023-03-02 12:37:39 +05:30 |
|
Sagar Sharma
|
6e9d001819
|
Merge branch 'develop' into github-issue-33344
|
2023-03-02 12:09:21 +05:30 |
|
Sagar Sharma
|
50dc0c18eb
|
Merge branch 'develop' into fix-return-pr-serial-no
|
2023-03-02 12:06:59 +05:30 |
|
Ankush Menat
|
330ae419be
|
fix!: Parse float as per number format in quality inspection (#34259)
fix: Parse float as per number format in quality inspection
|
2023-03-02 11:59:18 +05:30 |
|
s-aga-r
|
cb0b6de4b9
|
fix: Serial No is mandatory even if the qty is 0
|
2023-03-02 11:27:46 +05:30 |
|
s-aga-r
|
a9f0a11ce6
|
fix: rejected_serial_no not getting copied from PR to PR(Return)
|
2023-03-02 11:15:46 +05:30 |
|
Deepesh Garg
|
790f0aac12
|
Merge branch 'develop' into finance_book_read_only
|
2023-03-02 10:01:12 +05:30 |
|
Deepesh Garg
|
6a89cb98ce
|
Merge pull request #33874 from frappe/alternative-items-quotation
feat: Support for Alternative Items in Quotation
|
2023-03-01 17:41:24 +05:30 |
|
Suraj Shetty
|
e0a3869874
|
Merge pull request #34266 from frappe/mergify/bp/develop/pr-34265
|
2023-03-01 17:06:20 +05:30 |
|
Suraj Shetty
|
6cd2ba5c66
|
fix: Resolve conflicts
(cherry picked from commit f6469d83981386a7bb57b41178055eae5cda30bf)
|
2023-03-01 10:59:21 +00:00 |
|
Suraj Shetty
|
46a722d51c
|
fix: Wrap unexpectedly long text in remark
(cherry picked from commit ba66a6714c495f9d70dad79344342779c8011c6e)
# Conflicts:
# erpnext/accounts/report/general_ledger/general_ledger.html
(cherry picked from commit b13bf1ebc517ccd9c5b6b079208ca3883e7418fd)
|
2023-03-01 10:59:20 +00:00 |
|
rohitwaghchaure
|
32b64db4d6
|
Merge pull request #34254 from rohitwaghchaure/fixed-subcontracting-stock-availability-issue
fix: consumed qty validation for subcontracting receipt
|
2023-03-01 15:15:25 +05:30 |
|
Deepesh Garg
|
28dd1a25cb
|
chore: Make finance book read only
|
2023-03-01 15:00:24 +05:30 |
|
Deepesh Garg
|
e5f603c9d9
|
perf: Apply closing balance in Trial Balance report
|
2023-03-01 14:48:06 +05:30 |
|
Deepesh Garg
|
95c9aafda9
|
fix: Update patch to generate closing balance entries
|
2023-03-01 14:45:22 +05:30 |
|
Deepesh Garg
|
436fc03eda
|
fix: Closing balance entries for period closing voucher
|
2023-03-01 14:43:49 +05:30 |
|
Rohit Waghchaure
|
b38fe24090
|
fix: consumed qty validation for subcontracting receipt
|
2023-03-01 11:42:59 +05:30 |
|
rohitwaghchaure
|
d88fe27be6
|
Merge pull request #34195 from HarryPaulo/fix-performance-on-insert-item
fix: Performance improvement when adding a new item
|
2023-03-01 10:10:14 +05:30 |
|
ruthra kumar
|
f9c75055bb
|
Merge pull request #34241 from ruthra-kumar/bug_on_credit_note_creation
fix: pos return throwing amount greater than grand total
|
2023-02-28 18:22:30 +05:30 |
|
rohitwaghchaure
|
9bb8e351a2
|
Merge pull request #34243 from rohitwaghchaure/fixed-date-filters-in-subcontracting-reports
fix: default date in Subcontracting reports
|
2023-02-28 18:01:14 +05:30 |
|
Rohit Waghchaure
|
dfddc4efc3
|
fix: default date in Subcontracting reports
|
2023-02-28 17:53:51 +05:30 |
|
rohitwaghchaure
|
2942cee31e
|
Merge pull request #34235 from rohitwaghchaure/feat-adjust-valuation-rate
feat: adjust purchase receipt valuation rate as per purchase invoice rate
|
2023-02-28 17:34:53 +05:30 |
|
ruthra kumar
|
35c70f39fa
|
fix: pos return throwing amount greater than grand total
|
2023-02-28 16:21:32 +05:30 |
|
Rohit Waghchaure
|
a8445da02a
|
fix: labels name
|
2023-02-28 15:47:45 +05:30 |
|
s-aga-r
|
58c027d4cc
|
chore: Linters
|
2023-02-28 15:14:34 +05:30 |
|
Sagar Sharma
|
26ced47ddc
|
Merge branch 'develop' into github-issue-33344
|
2023-02-28 15:01:40 +05:30 |
|
Rohit Waghchaure
|
8e86553717
|
test: added test cases
|
2023-02-28 14:57:04 +05:30 |
|
Sagar Sharma
|
90abb28cb4
|
Merge pull request #34060 from vishdha/pos_fix
fix: multiple Point of Sale conversion issue resolved
|
2023-02-28 14:55:14 +05:30 |
|
Rohit Waghchaure
|
eab775ef32
|
feat: adjust purchase receipt valuation rate as per purchase invoice rate
|
2023-02-28 14:11:55 +05:30 |
|
Vishal
|
f18ae5856f
|
chore: minor changes in pos_controller
|
2023-02-28 11:03:26 +05:30 |
|