s-aga-r
|
6b144baa69
|
refactor: rewrite get_item_details.py queries in QB
|
2023-02-18 22:23:51 +05:30 |
|
rohitwaghchaure
|
dff9655d46
|
Merge pull request #34115 from rohitwaghchaure/fixed-convert-to-item-warehouse-reposting
feat: provision to convert transaction based reposting to item wareho…
|
2023-02-18 21:31:20 +05:30 |
|
Rohit Waghchaure
|
f1383b5ef9
|
feat: provision to convert transaction based reposting to item warehouse based reposting
|
2023-02-18 19:31:48 +05:30 |
|
Sagar Sharma
|
c292859b59
|
Merge pull request #34077 from s-aga-r/purchase-order-portal
fix: show Purchase Order Portal `Pay` button based on configuration
|
2023-02-18 12:20:14 +05:30 |
|
Sagar Sharma
|
91983fb4c6
|
Merge branch 'develop' into purchase-order-portal
|
2023-02-17 23:17:00 +05:30 |
|
Prateek
|
b93c18bd4a
|
fix: use max function to get default company address
|
2023-02-17 20:25:13 +05:30 |
|
rohitwaghchaure
|
47264481ad
|
Merge branch 'develop' into purchase-invoice-performance-issue
|
2023-02-17 16:41:30 +05:30 |
|
Anand Baburajan
|
6b3028d77b
|
Merge pull request #34111 from AnandBaburajan/asset_fixes_17_feb
fix: repair status after deletion, asset status after manual depr entry and other misc bugs [develop]
|
2023-02-17 16:12:45 +05:30 |
|
anandbaburajan
|
e50bd52162
|
fix: asset repair status after deletion and asset status after manual depr entry
|
2023-02-17 15:32:24 +05:30 |
|
Sagar Sharma
|
ee21850ab8
|
Merge branch 'develop' into purchase-order-portal
|
2023-02-17 11:08:30 +05:30 |
|
ruthra kumar
|
067f8c1d70
|
Merge pull request #34071 from ruthra-kumar/rearrange_patch_order
patch: reorder migration patches
|
2023-02-17 11:04:36 +05:30 |
|
ruthra kumar
|
68202639f5
|
chore: reorder migration patches.
'migrate_gl_to_payment_ledger',
'migrate_remarks_from_gl_to_payment_ledger' should always run last.
|
2023-02-17 10:03:55 +05:30 |
|
rohitwaghchaure
|
4399a93843
|
Merge pull request #34091 from rohitwaghchaure/fixed-incorrect-consumed-qty-in-scr
fix: incorrect consumed qty in subcontracting receipt
|
2023-02-16 15:10:14 +05:30 |
|
Sagar Sharma
|
758f47bba6
|
Merge branch 'develop' into purchase-order-portal
|
2023-02-16 14:28:05 +05:30 |
|
Sagar Sharma
|
70660191a6
|
Merge pull request #34090 from frappe/update-codeowners
chore: update `CODEOWNERS`
|
2023-02-16 14:26:11 +05:30 |
|
Sagar Sharma
|
320f3c1ac0
|
Merge branch 'develop' into update-codeowners
|
2023-02-16 14:25:19 +05:30 |
|
Rohit Waghchaure
|
156e45970a
|
fix: incorrect consumed qty in subcontracting receipt
|
2023-02-16 14:17:27 +05:30 |
|
HENRY Florian
|
4d79ffe3c6
|
fix: rename duplicate field name with same type into a DocType to avoid import Error (#34053)
* fix: Delivery Note field label set
* fix: Item field label de-duplicate name
* fix: Payment Entry field label de-duplicate name
* fix: Pruicing Rule field label de-duplicate name
* fix: Project field label de-duplicate name
* fix: Timesheet field label de-duplicate name
* Update erpnext/accounts/doctype/pricing_rule/pricing_rule.json
Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
* Update erpnext/stock/doctype/item/item.json
Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
---------
Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
|
2023-02-16 13:46:19 +05:30 |
|
Sagar Sharma
|
e8b8c51d82
|
chore: update CODEOWNERS
|
2023-02-16 12:55:37 +05:30 |
|
Sagar Sharma
|
fb5796f18f
|
Merge branch 'develop' into purchase-order-portal
|
2023-02-16 11:22:19 +05:30 |
|
Tej Pochiraju
|
3f44ef8790
|
Allow bulk import of party specific item (#34083)
Co-authored-by: Tej Pochiraju <tej@iotready.co>
|
2023-02-16 10:11:25 +05:30 |
|
Sagar Sharma
|
471e77b931
|
Merge branch 'develop' into purchase-order-portal
|
2023-02-15 22:46:07 +05:30 |
|
Sagar Sharma
|
c793fb0bb4
|
Merge pull request #34086 from s-aga-r/github-issue-33930
fix: create `Delivery Trip` from `Delivery Note` list
|
2023-02-15 22:40:10 +05:30 |
|
Sagar Sharma
|
c7a540b7e2
|
Merge branch 'develop' into github-issue-33930
|
2023-02-15 22:37:52 +05:30 |
|
s-aga-r
|
6c6195bae6
|
fix: create Delivery Trip from Delivery Note list
|
2023-02-15 22:37:26 +05:30 |
|
Sagar Sharma
|
421e34a181
|
Merge branch 'develop' into purchase-order-portal
|
2023-02-15 21:49:09 +05:30 |
|
Sagar Sharma
|
0cd69c8700
|
Merge pull request #34080 from s-aga-r/batch-no-item
chore: copy `item_code` to `Batch` while creating new batch from SCR
|
2023-02-15 21:39:07 +05:30 |
|
Sagar Sharma
|
46afbb594a
|
Merge branch 'develop' into fix-reserve-qty
|
2023-02-15 21:37:30 +05:30 |
|
s-aga-r
|
ffa9c6e4d9
|
chore: copy item_code to Batch while creating new batch from SCR
|
2023-02-15 20:16:42 +05:30 |
|
s-aga-r
|
20bdc63b03
|
fix: show Purchase Order Portal Pay button based on configuration
|
2023-02-15 20:14:39 +05:30 |
|
marination
|
74fab53e28
|
test: Alternative items in Quotation
- Taxes and totals, mapping, back updation
|
2023-02-15 15:04:00 +05:30 |
|
s-aga-r
|
d7ef5ad955
|
chore: add field show_pay_button in Buying Settings
|
2023-02-15 14:43:10 +05:30 |
|
Marica
|
22010b745c
|
Merge branch 'develop' into alternative-items-quotation
|
2023-02-15 13:05:33 +05:30 |
|
Anand Baburajan
|
d3ff289779
|
Merge pull request #34057 from AnandBaburajan/more_asset_bug_fixes
fix: manual depr entries in asset_depreciations_and_balances report and some misc bugs [develop]
|
2023-02-15 12:32:35 +05:30 |
|
Anand Baburajan
|
ef56060166
|
Merge branch 'develop' into more_asset_bug_fixes
|
2023-02-15 11:55:55 +05:30 |
|
rohitwaghchaure
|
2e43123048
|
Merge pull request #34065 from barredterra/print-rfq-letterhead
fix: change parameter name for letter head
|
2023-02-15 09:31:06 +05:30 |
|
rohitwaghchaure
|
9235918d65
|
Merge pull request #34061 from rohitwaghchaure/feat-allow-to-make-in-transit-entry
feat: allow to make in transit transfer entry from material request
|
2023-02-15 09:08:22 +05:30 |
|
barredterra
|
d5b7f2e49e
|
test: download RFQ PDF
|
2023-02-14 19:53:39 +01:00 |
|
barredterra
|
8e40c04494
|
refactor: download RFQ PDF
|
2023-02-14 19:53:03 +01:00 |
|
barredterra
|
f7fd30fecf
|
fix: change parameter name for letter head
To match changes from https://github.com/frappe/frappe/pull/19627
|
2023-02-14 19:34:36 +01:00 |
|
Devin Slauenwhite
|
4c5147f270
|
Merge: upstream/develop into pps190/fix-reserve-qty
|
2023-02-14 10:22:54 -05:00 |
|
Deepesh Garg
|
e69ea17f59
|
Merge pull request #34059 from AnandBaburajan/anand_codeowners
chore: add anand to asset's codeowner
|
2023-02-14 19:38:46 +05:30 |
|
Rohit Waghchaure
|
5b6128848f
|
feat: allow to make in transit transfer entry from material request
|
2023-02-14 19:03:07 +05:30 |
|
Anand Baburajan
|
662ebc5c1a
|
Merge branch 'develop' into anand_codeowners
|
2023-02-14 18:35:05 +05:30 |
|
anandbaburajan
|
d003370f61
|
chore: add anand to asset's codeowner
|
2023-02-14 18:33:01 +05:30 |
|
Anand Baburajan
|
b0cfb0b9ef
|
Merge branch 'develop' into more_asset_bug_fixes
|
2023-02-14 18:09:55 +05:30 |
|
anandbaburajan
|
a58f2e6c03
|
fix: asset_depreciation_and_balances report doesn't reflect manual depr entries
|
2023-02-14 17:59:16 +05:30 |
|
Sagar Sharma
|
75d9dbca43
|
Merge pull request #34018 from s-aga-r/fix-so-on-hold
fix: update `reserved_qty` when `Sales Order` marked as `Hold`
|
2023-02-14 16:51:56 +05:30 |
|
Sagar Sharma
|
447310702e
|
Merge branch 'develop' into fix-so-on-hold
|
2023-02-14 16:01:43 +05:30 |
|
ruthra kumar
|
960085853a
|
Merge pull request #34048 from ruthra-kumar/typeerror_on_sales_order_analysis
fix: typeerror on Sales Order analysis report
|
2023-02-14 15:27:36 +05:30 |
|