marination
a787ebb732
fix: Dont set idx
while adding WO items to Stock Entry
...
- `idx` must be computed by base document's `self.append()` function, so do not set it
2022-03-23 14:59:27 +05:30
Deepesh Garg
78ca88d227
fix: Check if onload property exists in the form object
2022-03-23 13:55:05 +05:30
Deepesh Garg
c3f1ad78aa
Merge pull request #30361 from deepeshgarg007/tax_account_display
...
fix: GST account not showing up in tax templates
2022-03-23 13:17:11 +05:30
Deepesh Garg
3a1e31592e
Merge branch 'develop' into ignore_price_list
2022-03-23 09:27:44 +05:30
Deepesh Garg
405dcb1d3c
fix: Add ignore pricelist for missing flows
2022-03-23 09:04:03 +05:30
Deepesh Garg
66ca085e39
fix: Changing item prices on converting orders/receipts to invoices
2022-03-22 23:03:41 +05:30
Deepesh Garg
57924599da
fix: GST account not showing up in tax templates
2022-03-22 18:26:58 +05:30
Saqib Ansari
f2ae63cbfd
fix(pos): remove returned sr. nos. from pos reserved sr. nos. list
2022-03-22 17:41:49 +05:30
Ankush Menat
f606d2ecc6
fix: flaky salary slip email test ( #30358 )
2022-03-22 17:36:18 +05:30
Ankush Menat
41db43cdc5
fix: consider full integer batch nos
2022-03-22 16:40:17 +05:30
Ankush Menat
a18c687844
fix: ignore already fetched serial no
...
exclude_sr_nos is sent as JSON string of list, so load it before
operating on it.
2022-03-22 16:40:17 +05:30
Deepesh Garg
ec04242d72
Merge pull request #30340 from deepeshgarg007/opening_too_field_fixes
...
fix: Opening invoice tool field placement
2022-03-22 16:17:12 +05:30
Deepesh Garg
749ab9b799
Merge branch 'develop' into bank_transaction_currency_symbol_fixes
2022-03-22 16:16:03 +05:30
Marica
87a0b72c26
Merge pull request #30336 from marination/product-filter-lookup
...
fix: Product Filters Lookup
2022-03-22 15:31:28 +05:30
Rucha Mahabal
0ae6561620
test: get leave allocation records query ( #30342 )
...
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-03-22 15:14:05 +05:30
Ankush Menat
51873da4bc
test: dynamic current FY creation in before_tests
2022-03-22 14:23:56 +05:30
Ankush Menat
6b638a196b
chore: drop dead sample code
2022-03-22 14:23:56 +05:30
Ankush Menat
9a99f993bc
refactor: merge print settings custom fields
2022-03-22 14:23:56 +05:30
Ankush Menat
457d616966
refactor: remove dead duplicate code
2022-03-22 14:23:56 +05:30
Ankush Menat
f37316a266
refactor: use get_value
instead of exists
2022-03-22 13:07:45 +05:30
barredterra
5c4eabf075
fix: usage of frappe.db.exists
2022-03-22 13:07:45 +05:30
Marica
387fa61a83
Merge branch 'develop' into product-filter-lookup
2022-03-22 12:13:46 +05:30
Deepesh Garg
01cd9e7c2e
Merge branch 'develop' into opening_too_field_fixes
2022-03-22 11:53:06 +05:30
Deepesh Garg
4e2f866a2a
Merge branch 'develop' into gst_state_number_unsetting
2022-03-22 11:52:55 +05:30
Deepesh Garg
645ed7d0fd
Merge branch 'develop' into sales_person_dashboard
2022-03-22 11:52:36 +05:30
Deepesh Garg
69a4b8c80b
Merge branch 'develop' into bank_transaction_currency_symbol_fixes
2022-03-22 11:52:20 +05:30
HarryPaulo
3eb5440aa9
fix: linters erros on report sales payments summary ( #30345 )
...
* fix: wrong values for report and get change amout based on payment TYPE.
* charcase for select field.
* fix: linter check erros
* fix: linters errors
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-03-22 11:39:15 +05:30
Deepesh Garg
636e7f67eb
fix: Opening invoice tool field placement
2022-03-21 19:34:57 +05:30
Deepesh Garg
e78a445c24
fix: Currency symbol in bank transactions
2022-03-21 19:06:04 +05:30
marination
f6e64c2cac
fix: Product Filters Lookup
...
- bind the right classes to the filter lookup field
- make class names more descriptive
- make filter lookup field more visible with white bg and border
- bind lookup input field js in `views.js`
- make filter lookup field functioning for atribute filters too
- added placeholder to lookup field
2022-03-21 17:58:39 +05:30
HarryPaulo
01fd3adedf
fix: report sales payments summary ( #30264 )
2022-03-21 16:57:27 +05:30
Deepesh Garg
9376d8d308
Merge pull request #30312 from alyf-de/refactor-sales-analytics
...
refactor: sales analytics
2022-03-21 16:44:23 +05:30
Deepesh Garg
363e676a35
fix: Reset GST State number
2022-03-21 16:28:17 +05:30
Ankush Menat
d3be84bfe8
test: correct use of test decorator
2022-03-21 15:40:34 +05:30
Rucha Mahabal
95568210b2
fix(ux): warning for disabled carry forwarding in Policy Assignment ( #30331 )
2022-03-21 15:30:04 +05:30
Saqib Ansari
aff7408775
fix(pos): allow validating stock on save
2022-03-21 14:08:56 +05:30
Saqib Ansari
4afb47e869
fix(pos): specific case when serialized item not removed
2022-03-21 13:24:11 +05:30
Saqib Ansari
2f82e237ef
fix(pos): customer group filter in customer selector
2022-03-21 12:47:35 +05:30
Deepesh Garg
3a7776ea7f
fix: Contribution amount against invoices in Sales Person Dashboard
2022-03-21 12:04:18 +05:30
Saqib Ansari
d5fd8e0ba6
fix: prevent multiple save on applying coupon code
2022-03-21 11:36:30 +05:30
Deepesh Garg
1daaf6be2a
Merge pull request #30317 from deepeshgarg007/opening_gl_validation
...
fix: P&L account validation on cancellation
2022-03-21 10:45:07 +05:30
Saqib Ansari
6dc7d6b085
Merge pull request #30287 from nextchamp-saqib/fix-cash-flow-query
...
fix: custom cash flow mapper doesn't show any data
2022-03-21 10:32:42 +05:30
Deepesh Garg
28001ddf42
Merge pull request #30304 from deepeshgarg007/enable_ksa_vat_docs
...
fix: Add permission for KSA VAT documents
2022-03-21 10:18:40 +05:30
Deepesh Garg
2ff6790283
fix: P&L account validation on cancellation
2022-03-21 09:43:31 +05:30
Raffael Meyer
0a015b7f70
refactor: remove redundant if-statement ( #30311 )
2022-03-20 19:29:41 +05:30
Ankush Menat
c2aad115c1
fix: disable deferred naming on SLE/GLE if hash method is used. ( #30286 )
...
* fix: dont rename GLE/SLE that dont have naming series
* test: tests for deferred naming of ledgers
2022-03-20 19:26:34 +05:30
HENRY Florian
ca8d757691
fix: clear "Retain Sample" and "Max Sample Quantity" in Item card if Has Batch No is uncheck ( #30307 )
2022-03-20 15:27:00 +05:30
barredterra
36df21067c
refactor: sales analytics
2022-03-20 03:58:24 +01:00
Ankush Menat
4859574233
perf: Single query to delete bins instead of N
2022-03-19 20:55:27 +05:30
Ankush Menat
684d9d66d1
test: warehouse conversion and treeview test
2022-03-19 20:55:27 +05:30
Ankush Menat
953afda01b
refactor(warehouse): raw query to ORM
2022-03-19 20:55:27 +05:30
Ankush Menat
4b695915f4
refactor: Use QB for serial fetching query
2022-03-19 20:55:27 +05:30
Ankush Menat
a585dff6fd
refactor: batch no filter handling
2022-03-19 20:55:27 +05:30
Ankush Menat
b9eec331e3
test: auto serial fetching
2022-03-19 20:55:27 +05:30
Ankush Menat
4f8bb91eae
fix: sort serial nos before sending
2022-03-19 20:55:27 +05:30
Ankush Menat
0a533d6ccc
fix: skip already selected serials in sr selector
2022-03-19 20:55:27 +05:30
Ankush Menat
5ec27c9055
fix: filter serial nos by selected batch number
2022-03-19 20:55:27 +05:30
Ankush Menat
f4c213379e
fix: set current qty as default qty for stock entry
2022-03-19 20:55:27 +05:30
mergify[bot]
c2cbd407c1
fix: Allow on Submit for Material Request Item Required Date ( #30174 ) ( #30308 )
...
* fix: Allow on Submit for Material Request Item Required Date
* chore: whitespace
(cherry picked from commit cca9668309711bf3ca517726a94df547c5a16bbb)
Co-authored-by: Devarsh Bhatt <58166671+bhattdevarsh@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2022-03-19 20:31:06 +05:30
Deepesh Garg
01638a01cb
Merge pull request #30292 from frappe/mergify/bp/develop/pr-30284
...
fix: Cleanup and fixes in Dimension-wise Accounts Balance Report (backport #30284 )
2022-03-18 17:36:59 +05:30
Deepesh Garg
972d06555a
fix: Add permission for KSA Vat documents
2022-03-18 17:32:46 +05:30
Ankush Menat
5a9bf9ffd6
fix: respect db multi_tenancy while fetching precision ( #30301 )
...
[skip ci]
2022-03-18 17:29:09 +05:30
Saqib Ansari
00bfee97c7
refactor: convert raw sql to frappe.qb
2022-03-18 14:31:30 +05:30
Deepesh Garg
8819ba07a9
Merge pull request #30266 from deepeshgarg007/expense_income_account_validation
...
fix: Validate income/expense account in sales and purchase invoice
2022-03-17 18:32:34 +05:30
Deepesh Garg
5390d5e65a
Merge branch 'develop' into mergify/bp/develop/pr-30284
2022-03-17 18:02:57 +05:30
Deepesh Garg
4237e5d928
fix: Test case
2022-03-17 18:00:39 +05:30
marination
f3715ab382
fix: Test, Sider and Added button to access log from Tool
2022-03-17 17:43:12 +05:30
Deepesh Garg
a651a0ffc8
Merge pull request #30261 from deepeshgarg007/bank_reco_error
...
fix: Error in bank reconciliation statement
2022-03-17 17:29:15 +05:30
Deepesh Garg
5f89cb2cca
fix: Remove comments
...
(cherry picked from commit cab69fe1f298b44613be21c06591e868c24ee249)
2022-03-17 11:57:50 +00:00
Deepesh Garg
2dd0e20003
fix: Clean and fixes in Dimension-wise Accounts Balance Report
...
(cherry picked from commit 08a06ce5c68023c41f53b584082b5e1c4ddb1f59)
2022-03-17 11:57:50 +00:00
rohitwaghchaure
da16ee159a
Merge pull request #30238 from KrithiRamani/bulk_create_PL_and_DN
...
feat: Create single PL/DN from several SO.
2022-03-17 15:39:45 +05:30
Rucha Mahabal
f090e63e54
test: fix holiday list creation causing flaky tests ( #30260 )
2022-03-17 15:21:56 +05:30
marination
3e3af95712
fix: Sider and Linter
2022-03-17 15:03:20 +05:30
Saqib Ansari
119273e633
fix: custom cash flow mapper doesn't show any data
2022-03-17 14:47:50 +05:30
marination
8aff75f8e8
feat: List View indicators for Log and Error Log link in log
2022-03-17 12:58:09 +05:30
marination
cff91558d4
chore: Polish error handling and code sepration
...
- Added Typing
- Moved all job business logic to bom update log
- Added `run_bom_job` that handles errors and runs either of two methods
- UX: Replace button disabled until both inputs are filled
- Show log creation message on UI for correctness
- APIs return log document as result
- Converted raw sql to QB
2022-03-17 12:32:37 +05:30
Ankush Menat
76187d175f
refactor: call repost directly during tests ( #30277 )
...
enqueue(now=frappe.flags.in_test) is always true in test, this change avoids
confusion.
2022-03-16 19:50:56 +05:30
marination
4283a13e5a
feat: BOM Update Log
...
- Created BOM Update Log that will handle queued job status and failures
- Moved validation and BG job to thus new doctype
- BOM Update Tool only works as an endpoint
2022-03-16 19:47:25 +05:30
Noah Jacob
2a0ca7c91a
refactor: removed unrequired code and test for standalone delivery note serial return ( #30276 )
2022-03-16 19:27:47 +05:30
Ankush Menat
b93ce78df1
chore: dont supress errors server side
...
not required after https://github.com/frappe/frappe/pull/16284
2022-03-16 17:50:34 +05:30
Krithi Ramani
a12895ec03
corrected spacing
2022-03-16 13:56:54 +05:30
Ankush Menat
b46d6e3c05
test: packed item return scenarios
2022-03-16 13:36:53 +05:30
Ankush Menat
b781e8b7d1
revert: "fix: updated packed_items getting fetched on Sales Return / Credit Note ( #28607 )"
...
This reverts commit 20216fa9f1
.
2022-03-16 13:36:53 +05:30
Deepesh Garg
2958f60b46
Merge pull request #30269 from deepeshgarg007/implicit_pricing_rule_enable_v2
...
fix: Do not update ignore pricing rule check implicitly
2022-03-16 12:32:25 +05:30
Krithi Ramani
0211f27e83
as per review comments - changed for loop
2022-03-16 12:28:30 +05:30
Deepesh Garg
1f79b47a17
fix: Do not update ignore prcing rule check implicitly
2022-03-16 11:55:43 +05:30
Saqib Ansari
e9e2679dff
Merge pull request #29984 from dj12djdjs/fix-rename-tool-msg
...
fix: rename tool show fail message
2022-03-16 10:57:17 +05:30
Saqib Ansari
597bb2c7e8
feat: safely parse exception
2022-03-16 10:53:39 +05:30
Deepesh Garg
06936cf1c0
fix: Validate income/expense account in sales and purchase invoice
2022-03-16 09:02:04 +05:30
Krithi Ramani
e970616b51
removed semicolon for break statement
2022-03-15 21:52:34 +05:30
Krithi Ramani
9f7fee7a4f
Added new field in SO - % Picked
2022-03-15 21:40:51 +05:30
Samuel Danieli
bbe5739547
feat: add German translations
2022-03-15 17:03:30 +01:00
Krithi Ramani
a68213d82e
added new field - Picked Qty, in Sales Order Item
2022-03-15 20:18:23 +05:30
Saqib Ansari
1797b6013e
Merge pull request #30244 from nextchamp-saqib/fix-gl-representation
...
fix: incorrect debit credit amount in presentation currency
2022-03-15 18:39:37 +05:30
Deepesh Garg
fbcb413d96
fix: Error in bank reco statement
2022-03-15 18:20:11 +05:30
Saqib Ansari
12d99ed69a
test: foreign_account_balance_after_exchange_rate_revaluation
2022-03-15 17:56:42 +05:30
Marica
b73948660a
Merge pull request #30258 from marination/sub-category-routing
...
fix: Sub-Category Routing in Item Group Page Listing pills
2022-03-15 17:29:39 +05:30
marination
8264d6b0bc
fix: Sub-Categpry Routing in Item Group Page Listing pills
...
- Use absolute route even 3-4 sub-category levels down
- Remove scroll from category pills due to accessibility issues
- Arrange sub-category pills alphabetically
2022-03-15 16:53:46 +05:30
Saqib Ansari
7b0a97d679
fix(pos): loyalty points in case of returned pos invoice ( #30242 )
2022-03-15 15:54:37 +05:30
mergify[bot]
e8310c6dec
fix: Job Card sub operations status and list view (backport #30243 ) ( #30256 )
...
* fix: show status in job card list view in Draft mode
(cherry picked from commit fa32fc3c832196004154055ac1b2334d6202c261)
* fix: job card - sub operations table status misbehaviour on pause / resume Job Card
(cherry picked from commit 7b8723445ee695e88590bb833f60a0c4731106fa)
Co-authored-by: Anoop Kurungadam <anoop@earthianslive.com>
2022-03-15 15:48:15 +05:30
Krithi Ramani
f33a725a9e
fixed spacings
2022-03-15 15:35:51 +05:30
Rucha Mahabal
3218ccbb96
fix: Leave Policy Assignment creation patch ( #30215 )
2022-03-15 11:43:27 +05:30
Rucha Mahabal
b03b9ac99f
fix: salary slip amount rounding errors ( #30248 )
2022-03-15 11:39:15 +05:30
Deepesh Garg
8add8eb058
Merge pull request #30230 from deepeshgarg007/vat_amount_in_ksa
...
fix: KSA E-Invoice QR Code showing wrong VAT amount
2022-03-14 21:47:22 +05:30
Deepesh Garg
07715118cf
Merge pull request #30206 from deepeshgarg007/implicit_pricing_rule_enable
...
fix: Do not update ignore prcing rule check implicitly
2022-03-14 21:46:24 +05:30
Saqib Ansari
83a5fae591
fix: incorrect debit credit amount in presentation currency
2022-03-14 20:14:46 +05:30
Deepesh Garg
e33d4713cd
Update erpnext/regional/saudi_arabia/utils.py
...
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
2022-03-14 18:35:49 +05:30
Ankush Menat
8e559f01c8
test: refactor BOM quality template test
2022-03-14 18:28:08 +05:30
Florian HENRY
9415229e8d
fix: BOM - clear Quality Inspection Template according to Inspection Quality Required
...
Squashed commit of the following:
commit b73fa210b234d2c8067db2c32f94f362b89afe5a
Author: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon Mar 14 08:30:24 2022 +0100
add json tes
commit 984d015a7d9aceb6ea64be7ed9f1cc0caa356714
Author: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon Mar 14 08:30:06 2022 +0100
better test
commit 42061146658598da02eda7cb781bd2cf44c8ca34
Author: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri Mar 11 16:12:57 2022 +0100
update test
commit 6259c0957566600b044fcd4a5e14e69cdff71020
Author: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri Mar 11 13:59:13 2022 +0100
update test
commit cbc4ad9566f6f7f01dd622651458fea309d80954
Merge: faa44b3fdd 94d0f8d4e7
Author: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri Mar 11 12:46:48 2022 +0100
Merge branch 'develop' of https://github.com/frappe/erpnext into dev_fix_30190
commit faa44b3fdd983adfc04bbf04a7ebfef114501bb3
Author: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri Mar 11 12:03:35 2022 +0100
fix: clear Quality Inspection Template according to Inspection Quality Required
2022-03-14 18:25:00 +05:30
Wolfram Schmidt
7537dac2a4
fix: translation for accounting
...
"Aufwand" rather than "Auslage". This is commonly used in accounting.
2022-03-14 18:22:07 +05:30
Deepesh Garg
1faca0eb5a
Merge branch 'develop' into vat_amount_in_ksa
2022-03-14 17:36:16 +05:30
Krithi Ramani
466df6bdb7
to enable selection of SO irrespective of customer,removed validation for customer
2022-03-14 17:29:02 +05:30
Ankush Menat
07712af357
Merge pull request #30233 from frappe/mergify/copy/develop/pr-30216
...
fix: max_qty validation condition in WO (copy #30216 )
2022-03-14 17:22:30 +05:30
Krithi Ramani
61eb9b6c68
feat: Create single PL/DN from several SO. New PR from latest develop to avoid rebase
2022-03-14 17:20:49 +05:30
Deepesh Garg
25a128220a
Merge pull request #30207 from deepeshgarg007/trail_balance_for_party
...
fix: Do not consider cancelled entries
2022-03-14 17:19:34 +05:30
Deepesh Garg
be56efad26
fix: Itemised tax rate updation
2022-03-14 17:17:01 +05:30
Ankush Menat
02d64a32c2
fix(ux): negative stock warning
2022-03-14 17:16:39 +05:30
Sagar Sharma
884cd814bc
test: add test for planned_qty
...
(cherry picked from commit b22bdc5ff762d41242c742bb3f6fda64eb98fd2e)
2022-03-14 11:31:52 +00:00
Sagar Sharma
3b86d6c73c
fix: max_qty validation condition
...
(cherry picked from commit d198c488a4071d13d0891d87f790562febd44b3e)
2022-03-14 11:31:52 +00:00
Deepesh Garg
3cc2e53b08
fix: Linting Issue
2022-03-14 16:27:04 +05:30
marination
a579a211fd
chore: Re-arrange fields for consistency with base currency LHS
2022-03-14 16:15:12 +05:30
Deepesh Garg
b37559c535
fix: KSA E-Invoice QR Code showing wrong VAT amount
2022-03-14 16:13:35 +05:30
marination
dcd88ddc87
fix: Add missing currency option in Supplier Quotation's rounded_total
field
2022-03-14 15:57:24 +05:30
Deepesh Garg
2b6e7963f6
Merge branch 'develop' into implicit_pricing_rule_enable
2022-03-14 15:49:21 +05:30
Noah Jacob
60c4593f7b
chore: removed unrequired batch_no parameter while fetching stock_balance
2022-03-14 15:36:56 +05:30
Noah Jacob
00797fa02d
test: checking balance serial nos in stock ledger report
2022-03-14 15:36:56 +05:30
Noah Jacob
e8ba1f4e74
fix: incorrect balance serial no in stock ledger report
2022-03-14 15:36:56 +05:30
Ankush Menat
6ee904d641
test: dont resubmit work order
2022-03-14 15:13:37 +05:30
mergify[bot]
12696ffeb4
fix: Search query of payroll entry reference in Journal Entry ( #30225 ) ( #30226 )
...
(cherry picked from commit 98a67967a38c4e5b7b1977c4257bd0b23c57eded)
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2022-03-14 14:44:02 +05:30
Ankush Menat
d3e90ed8c8
fix(patch): remove dead links to ProdPlan Item
2022-03-14 14:15:43 +05:30
Ankush Menat
1af13ca4bf
fix(ux): remove get item buttons from submitted production plan
2022-03-14 14:15:43 +05:30
Saqib Ansari
c1740ced97
fix: cannot create multicurrency sales order with product bundles ( #30166 )
2022-03-14 13:43:55 +05:30
Saqib Ansari
f5f6650779
Merge pull request #30217 from nextchamp-saqib/fix-so-to-po
...
fix: cannot create purchase order from sales order
2022-03-14 12:35:32 +05:30
Saqib Ansari
935218598a
Merge pull request #30198 from nextchamp-saqib/pos-fixes-#12
...
fix(pos): do not reset mode of payments in case of consolidation
2022-03-14 12:34:40 +05:30
Saqib Ansari
58804b8436
fix: cannot create purchase order from sales order
2022-03-14 12:31:13 +05:30
Saqib Ansari
2e265d9bf6
test: mode of payments in case of consolidation
2022-03-14 11:02:33 +05:30
Ankush Menat
941ea1ec74
fix(ux): skip items without batch series
2022-03-14 10:25:18 +05:30
Ankush Menat
91fd9d917a
test: negative fifo test
2022-03-14 10:25:18 +05:30
Rucha Mahabal
211916bfce
Merge branch 'develop' into leave-opening-balance
2022-03-13 20:30:36 +05:30
Rucha Mahabal
d61c437588
fix: flaky tests
2022-03-13 20:30:18 +05:30
Deepesh Garg
835c029e53
Merge pull request #29979 from deepeshgarg007/bank_reco_multicurrency_fix
...
fix: Multi-currency bank reconciliation fixes
2022-03-13 20:27:04 +05:30
Rucha Mahabal
558650bc3a
fix: add more type hints
2022-03-13 20:02:51 +05:30
Deepesh Garg
5ae610bd32
Merge pull request #30039 from deepeshgarg007/gstr_3b_nil_exempt_fixed
...
fix: Nil and Exempted values in GSTR-3B Report
2022-03-13 20:00:48 +05:30
Ankush Menat
1a256c62c4
fix: attach sr no si standalone credit note
2022-03-13 19:00:34 +05:30
Ankush Menat
1c37d2711a
test: standalone SI creates and attaches serial nos
2022-03-13 19:00:34 +05:30
Deepesh Garg
6308e1be91
fix: Do not consider cancelled entries
2022-03-13 18:13:12 +05:30
Deepesh Garg
96b5cedcf8
fix: Do not update ignore prcing rule check implicitly
2022-03-13 17:48:37 +05:30
Deepesh Garg
22dfd5a4b1
Merge pull request #30152 from deepeshgarg007/sales_purchase_retrun_optimization
...
fix: Sales and Purchase return optimization
2022-03-13 17:13:53 +05:30
Deepesh Garg
60ba0ba219
Merge branch 'develop' into loan_cost_center
2022-03-13 12:50:27 +05:30
Deepesh Garg
e4e38ad60b
Merge branch 'develop' into sales_purchase_retrun_optimization
2022-03-13 12:45:10 +05:30
Saqib Ansari
e8a7a54d5a
fix(pos): do not reset mode of payments in case of consolidation
2022-03-12 19:20:48 +05:30
mergify[bot]
b085e96a12
revert: "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount" ( #29782 ) ( #29807 )
...
* Revert "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount"
This reverts commit 038f94955006c88209f9df28e3a785c59a4ddb28, reversing
changes made to c7b491843476bca89be02851ccafb7e409876609.
* fix: linter
(cherry picked from commit 7fa46f77e0bdbc516b3c0cb0fb20594ee7fa398b)
# Conflicts:
# erpnext/patches.txt
Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
2022-03-11 18:28:50 +05:30
Ankush Menat
94d0f8d4e7
test: actual bom naming test
2022-03-11 17:11:22 +05:30
Rohan Bansal
67d8a7ba86
fix: cancelled document check
2022-03-11 17:11:22 +05:30
Ankush Menat
6b58d53403
refactor: split versioning code for testability
2022-03-11 17:11:22 +05:30
Rohan Bansal
7f2670941c
fix: improve bom autoname logic
2022-03-11 17:11:22 +05:30
Ankush Menat
e2c99e02a9
test: bom for item_code that is >VARCHAR_LEN
2022-03-11 17:11:22 +05:30
Rohan Bansal
d9c91748f4
fix: if an item code is too long, truncate before setting BOM name
2022-03-11 17:11:22 +05:30
Rucha Mahabal
8173e6a8ea
fix: simplify insufficient leave balance message
2022-03-11 15:30:01 +05:30
Deepesh Garg
13dce71c21
Merge pull request #30181 from deepeshgarg007/shipping_rule_application
...
fix: Shipping rule application fixes
2022-03-11 12:04:12 +05:30
Deepesh Garg
d596e0e4df
fix: Shipping rule application fixes
2022-03-10 20:56:36 +05:30
Ankush Menat
472fe8e319
test: submit PR directly
2022-03-10 18:08:29 +05:30
Ankush Menat
6c54be0dcd
test: flaky MR report test
...
all test records are on same day so sorting was random in report rows.
2022-03-10 18:08:29 +05:30
Ankush Menat
7dd10367f4
fix: only update valuation rate if not None
2022-03-10 18:08:29 +05:30
Ankush Menat
362102e802
fix: dont hardcode hour rate precision
2022-03-10 17:23:50 +05:30
Ankush Menat
18e2a33a9b
fix: fetch new fields in bom from routing
2022-03-10 17:23:50 +05:30
Ankush Menat
73901aad6f
fix: handle duplicate bins during item merge renames
2022-03-10 17:01:22 +05:30
Ankush Menat
b4d4ae6aa3
test: refactor item merge test and disable commits
2022-03-10 17:01:22 +05:30
Ankush Menat
4126455975
fix: dont reset UOM in MR on every get_item_detail call ( #30164 )
2022-03-10 15:43:09 +05:30
Rucha Mahabal
b2c549a464
fix: conflicts
2022-03-10 15:41:14 +05:30
Raffael Meyer
6794148c04
fix(lead): reload contact before updating links ( #29966 )
...
* fix(lead): reload contact before updading links
Contact might have changed since it was created.
* refactor: reload contact after insert
2022-03-10 14:47:29 +05:30
Rucha Mahabal
79b0354efc
Merge branch 'develop' into leave-opening-balance
2022-03-10 14:45:46 +05:30
Marica
93e9fe8327
Merge pull request #30160 from marination/cart-without-checkout
...
fix: 'save_quotations_as_draft' checkbox not honoured
2022-03-10 14:37:58 +05:30
Saqib Ansari
390feeaa73
Merge pull request #30103 from ChillarAnand/party
...
fix: Ignore missing customer group while fetching price list
2022-03-10 14:36:19 +05:30
Rucha Mahabal
9fae89ff61
fix: flaky tests ( #30154 )
2022-03-10 14:22:12 +05:30
Deepesh Garg
a5befb6bf8
fix: Update modified timestamp
2022-03-10 14:18:54 +05:30
Marica
8486f5f321
Merge branch 'develop' into bom-update-tool
2022-03-10 13:56:38 +05:30
Saqib Ansari
e5fb871ef4
fix: Ignore missing customer group while fetching price list
2022-03-10 13:54:43 +05:30
marination
a13e06156b
fix: 'save_quotations_as_draft' checkbox not honoured
...
- Make sure `request_for_quotation` considers `save_quotations_as_draft`
- Added test for checkout disabled quote
2022-03-10 13:54:00 +05:30
Saqib Ansari
9dc9758522
Merge branch 'develop' of https://github.com/frappe/erpnext into party
2022-03-10 13:51:36 +05:30
Himanshu
5193a63781
fix: do not reset asset_category ( #29696 )
2022-03-10 13:43:35 +05:30
Deepesh Garg
e9d458b822
fix: Update party type
2022-03-10 12:29:17 +05:30
Deepesh Garg
5d66cc4c4a
fix: Add cost center in loan document
2022-03-10 12:22:37 +05:30
Saqib Ansari
8021572432
Merge branch 'develop' into fix-psoa-template
2022-03-10 12:17:11 +05:30
Ankush Menat
84568ac341
chore: imports
2022-03-10 11:20:23 +05:30
Saqib Ansari
5d5ae16fe5
fix(psoa): no such element: dict object['account']
2022-03-10 11:12:33 +05:30
Saqib Ansari
45c1d83ea1
Merge pull request #30145 from nextchamp-saqib/add-filter-to-psoa
...
fix(psoa): add company filter to account
2022-03-10 10:53:52 +05:30
Deepesh Garg
395b15058c
fix: Sales and Purchase retrun optimization
2022-03-10 10:50:03 +05:30
Rucha Mahabal
f066427913
fix: program enrollment button labels ( #30148 )
2022-03-10 10:06:07 +05:30
marination
f57725f8fa
refactor: Add exception handling in background job within BOM Update Tool
2022-03-09 19:03:07 +05:30
Saqib Ansari
fc42041f8f
fix(psoa): add company filter to account
2022-03-09 18:04:35 +05:30
Chillar Anand
fe4b6771b5
refactor: Remove dead code ( #30140 )
2022-03-09 17:16:05 +05:30
Chillar Anand
b1c8a4543d
test: Added test for monthly attendance report ( #29989 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2022-03-09 17:05:00 +05:30
Rucha Mahabal
921d6b25d7
chore: linter issue
2022-03-09 16:58:15 +05:30
Deepesh Garg
45eed7167c
Merge pull request #29654 from alyf-de/revert-bu-schluessel
...
revert: BU Schlüssel (a21f76f)
2022-03-09 16:48:54 +05:30
Marica
2661cb2c14
Merge pull request #30091 from marination/item-group-filters-listing
...
feat: Include child item group products in Item Group Page & cleanup
2022-03-09 16:46:01 +05:30
Saqib Ansari
4d8798b0ea
fix: ignore non-unique swift numbers while migrating ( #30132 )
2022-03-09 16:41:54 +05:30
Saqib Ansari
17e16247b1
Merge pull request #30114 from nextchamp-saqib/fix-#23231
...
perf(asset): fetch only distinct depreciable assets
2022-03-09 16:41:08 +05:30
Rucha Mahabal
9b152e93cf
Merge branch 'develop' into leave-opening-balance
2022-03-09 16:40:26 +05:30
Rucha Mahabal
97b7b5012e
test: separate leave ledger entries for leave applications across allocations
2022-03-09 16:35:25 +05:30