Ankush Menat
849a2dc349
Merge branch 'develop' into patch-4
2022-06-02 10:25:20 +05:30
Ankush Menat
77dcdff0db
fix: unusable SO after clearing taxes ( #31215 )
2022-06-01 22:01:07 +05:30
Sun Howwrongbum
48bde2de2a
fix: Trial Balance failing to ignore Finance Book
2022-06-01 20:20:16 +05:30
Rucha Mahabal
661e05e693
fix(tests): account and company setups
2022-06-01 17:28:42 +05:30
Ankush Menat
3974fbbb6e
feat: UOM specific barcodes ( #30988 )
2022-06-01 16:43:56 +05:30
Mohammad Hussain Nagaria
37433aad48
fix: Pluralize year text instead of optional bracket ( #31210 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2022-06-01 16:29:20 +05:30
Rucha Mahabal
536f1dfc4b
test: fix attendance tests for unmarked days ( #31205 )
...
* test: fix attendance tests for unmarked days
* chore: remove unused import
2022-06-01 13:56:55 +05:30
Ankush Menat
c84e11ac82
fix: re-validate warehouse after 'update items' ( #31203 )
2022-06-01 12:55:10 +05:30
Rucha Mahabal
d4b9cc0242
fix: remove leave policy assignment creation patch ( #31097 )
2022-06-01 12:18:14 +05:30
Rucha Mahabal
1c91793634
Merge branch 'develop' into fix-salary-slip-bg-job
2022-06-01 12:15:42 +05:30
Rucha Mahabal
653d6341d4
refactor: clean-up and commonify payroll entry test setups
2022-06-01 12:14:42 +05:30
Deepesh Garg
82be717f10
Merge pull request #31201 from deepeshgarg007/manufacturing_workspace_fix
...
fix: Remove domain restriction from Manufacturing Workspace
2022-06-01 09:30:39 +05:30
Deepesh Garg
167cf7b49d
fix: Remove domain restrcition from Manufacturing Workspace
2022-06-01 09:04:53 +05:30
Deepesh Garg
753eb3ec3a
Merge branch 'develop' into bug_sales_order_analysis_report
2022-05-31 21:41:35 +05:30
Deepesh Garg
5fd31c6433
Merge pull request #31199 from deepeshgarg007/settings_perm_fix
...
fix: Permission for selling and buying settings
2022-05-31 21:40:55 +05:30
maharshivpatel
b3ccc4bfb9
fix: Auto Insert Item Price If Missing when discount & blank UOM ( #31168 )
...
* fix: Auto Insert Item Price If Missing when discount and blank UOM
fixes wrong item price insert when discount is used and adds uom=stock_uom instead of blank as price is converted to stock uom
* unit tests added for item with discount
I have added test for auto_insert_price where discount is used.
* unit test issue fixed
fixed make_sales_order as some of the test that depended on it were failing due to passing of incorrect parameters.
Co-authored-by: Ankush Menat <me@ankush.dev>
2022-05-31 19:48:30 +05:30
Deepesh Garg
a6beafbc3c
fix: Permission for selling and buying settings
2022-05-31 19:41:46 +05:30
hrzzz
c4af63ad98
feat: two new groupby mode: Monthly, Payment Term
2022-05-31 10:46:56 -03:00
ruthra kumar
4f1bfbb93d
test: multiple delivery notes and billed quantity
2022-05-31 17:24:36 +05:30
ruthra kumar
0331e37982
fix: incorrect billed_qty when item has multiple Delivery note
...
sales order analysis report returns incorrect billed_qty value for
an SO item has multiple delivery notes
2022-05-31 17:15:31 +05:30
marination
a62bc9b6c9
chore: Limit Update Cost jobs & db_update only if changed values
...
- If `Update Cost` job is ongoing, then block creation of new ones since all BOMs are updated
- `db_update` in `calculate_rm_cost` only if changed values to reduce redundant row updates
- Misc: Use variable for batch size
2022-05-31 16:00:29 +05:30
Ankush Menat
a1b7a7983a
refactor!: drop naming series tool ( #31183 )
2022-05-31 15:35:40 +05:30
Ankush Menat
691b34a8ed
chore: unnessary args
2022-05-31 14:15:13 +05:30
Ankush Menat
ddb46c5711
fix: batch selector flag ( #31191 )
...
This is broken again after serializing scan actions, which causes
selector to trigger before batch_no is set.
Solution: for duration of scan disable the selector
2022-05-31 14:14:27 +05:30
maharshivpatel
a8f98f3f96
feat(india): Improve E-way Bill Cancellation. ( #31088 )
2022-05-31 12:14:39 +05:30
Rucha Mahabal
ed1ba677d6
test: HRA Exemption in Proof Submission
2022-05-31 11:54:43 +05:30
Rucha Mahabal
cfe2f8cac1
fix: amount precision for Tax Exemption Proof Submission
2022-05-31 11:54:43 +05:30
Rucha Mahabal
2e98e9e0b9
test: set country to India before running regional tests
2022-05-31 11:54:43 +05:30
Rucha Mahabal
00adda7c8d
fix: Tax Declaration tests and amount precision
2022-05-31 11:54:43 +05:30
Rucha Mahabal
5e96a46c87
test: HRA Exemption in Employee Tax Exemption Declaration
2022-05-31 11:54:43 +05:30
Rucha Mahabal
2b65c9616f
fix: component pay calculation
2022-05-31 11:54:43 +05:30
Rucha Mahabal
34925a3a8c
fix: HRA Exemption calculation in case of multiple salary structure assignments
2022-05-31 11:54:43 +05:30
Deepesh Garg
f07246af82
Merge pull request #31127 from deepeshgarg007/loan_interest_accrual
...
feat: Auto accrue loan interest for backdated term loans
2022-05-31 09:55:26 +05:30
Mitchy25
a0c412a0dd
Ignore Cancelled GL Entries
...
Profitability Analysis includes 'is_cancelled' GL Entries which means that the profit numbers are incorrect. This change will ensure that the profit figures ignore cancelled GL Entries.
2022-05-31 15:25:09 +12:00
ruthra kumar
4c74637c91
refactor: remove naming expression for payment ledger
2022-05-30 19:06:56 +05:30
Rucha Mahabal
78c39e947b
test: Salary Slip operations queuing, failure, and payroll entry status
...
- fix multicurrency test, remove redundant doc creation
2022-05-30 16:07:19 +05:30
Rucha Mahabal
42f6bca935
fix: reset Error Message on successful operation and fix status update on submit/cancel
2022-05-30 16:04:07 +05:30
Saqib Ansari
08bf0baaae
chore!: remove unused bill no & date from purchase receipt ( #31163 )
2022-05-30 14:50:50 +05:30
Rucha Mahabal
de55157997
chore: rename method get_salary_component_account method to set
...
- since it doesn't return any value
2022-05-30 12:47:26 +05:30
Ankush Menat
d7a7c47650
Merge branch 'develop' into recursive_non_explosive_bom
2022-05-30 11:12:57 +05:30
Ankush Menat
c02598a51b
chore: remove framework tests from erpnext
...
Similar tests exist in FW and this is failing because someone updated
the translations
2022-05-30 11:12:17 +05:30
Ankush Menat
954dac88a8
fix: allow non-explosive recrusive BOMs
...
Recursion should be allowed as long as child item is not "exploded"
further by a BOM.
2022-05-30 10:40:13 +05:30
Ankush Menat
d224bf1d34
fix: only erase BOM when do_not_explode is set
2022-05-30 10:40:13 +05:30
Ankush Menat
b170cec2fe
fix(ux): "New Version" button BOM
...
"duplicate" technically creates a new version but that's not intuitive
at all.
2022-05-30 10:40:12 +05:30
Devin Slauenwhite
85b48fcdb9
fix: barcode scan resolve after model is updated ( #31058 )
...
* fix: resolve row after model is updated.
* fix: wait for all fields in the model to be updated.
* fix: sider
* pref: clear scanned code after capturing value
* fix: use frappe.run_serially
2022-05-29 22:19:09 +05:30
Ankush Menat
933434c3ea
chore: format
2022-05-29 22:09:32 +05:30
marination
978ba5238f
fix: Safe cast row.rate (in case of faulty exploded items, edge case but oh well)
2022-05-27 21:59:59 +05:30
marination
2de2491e17
perf: get_next_higher_level_boms
...
- Separate getting dependants and checking if they are valid (loop within loop led to redundant processing that slowed down function)
- Adding to above, the same dependant(parent) was repeatedly processed as many children shared it. Expensive.
- Use a parent-child map similar to child-parent map to check if all children are resolved
- `map.get()` reduced time: 10 mins -> 0.9s~1 second (as compared to `get_cached_doc` or query)
- Total time: 17 seconds to process 6599 leaf boms and 4.2L parent boms
- Previous Total time: >10 mins (I terminated it due to not wanting to waste time XD)
2022-05-27 20:33:14 +05:30
HENRY Florian
ce8e05146e
chore: update translation fr for BOM ( #31126 )
...
* fix: update translation
* fix: fr translation for BOM
2022-05-27 17:27:43 +05:30
MOHAMMED NIYAS
7ff8acac51
fix: date filter on quality inspection report ( #31148 )
...
* fix: date filter
fix from date to to date filter btw those days
* fix: remove unnecessary conditions
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2022-05-27 17:13:14 +05:30
marination
5949946265
chore: Change BOM Progress field types to Long Text
2022-05-27 17:04:21 +05:30
Rucha Mahabal
4df76f3956
Merge pull request #31160 from ruchamahabal/fix-gratuity-status-update
2022-05-27 15:05:31 +05:30
Rucha Mahabal
c9e070393d
test: make holiday list before running gratuity tests
2022-05-27 14:42:11 +05:30
marination
eabd8290d4
feat: Only update exploded items rate and amount
...
- Generate RM-Rate map from Items table (will include subassembly items with rate)
- Function to reset exploded item rate from above map
- `db_update` exploded item rate only if rate is changed
- Via Update Cost, only update exploded items rate, do not regenerate table again
- Exploded Items are regenerated on Save and Replace BOM job
- `calculate_exploded_cost` is run only via non doc events (Update Cost button, Update BOMs Cost Job)
2022-05-27 14:32:58 +05:30
Rucha Mahabal
79b0aede00
fix: add list view settings for Gratuity
2022-05-27 13:57:09 +05:30
Rucha Mahabal
6c66bbbbfe
refactor: clean-up gratuity tests
2022-05-27 13:39:25 +05:30
Rucha Mahabal
b81d7519c1
test: Gratuity status for payment via salary slip
2022-05-27 12:58:10 +05:30
Rucha Mahabal
385e22a067
fix: Gratuity status not updated on salary slip submission
2022-05-27 12:57:07 +05:30
Deepesh Garg
7adcac4e66
Merge pull request #31155 from deepeshgarg007/exchnage_rate_reset
...
fix: Exchange rate reste to 1 on making mapped doc
2022-05-27 12:17:17 +05:30
HarryPaulo
4b04694c2c
fix(pos): freeze screen while processing pos invoices ( #30850 )
2022-05-27 12:16:07 +05:30
Deepesh Garg
2a10f09d8d
fix: Exchange rate reste to 1 on making mapped doc
2022-05-27 12:12:34 +05:30
maharshivpatel
935e5b1dcd
fix(india): duplicate qrcode and hide button ( #31100 )
2022-05-27 11:48:55 +05:30
Deepesh Garg
d0a9eb4fd0
Merge branch 'develop' into fix-average-discount-auth
2022-05-26 18:22:34 +05:30
Ankush Menat
e3c0d0134e
Merge pull request #31101 from alyf-de/fix-warehouse-js
...
fix: Improve button labels in Warehouse
2022-05-26 18:14:49 +05:30
Ankush Menat
ff798dc5c0
Merge pull request #31141 from ankush/naming_series_live_preview
...
feat: live preview of naming series on naming series tool
2022-05-26 16:49:59 +05:30
Ankush Menat
47b539e638
fix: skip existing batch number during autogen ( #31140 )
2022-05-26 16:20:56 +05:30
Ankush Menat
964b4184a6
test: add basic tests for naming series tool
2022-05-26 16:17:56 +05:30
Ankush Menat
4d0e2aa33a
docs: update help information on naming series
2022-05-26 15:36:48 +05:30
Ankush Menat
24d1bf5328
feat: preview next numbers on naming series tool
2022-05-26 15:15:59 +05:30
Ankush Menat
82cd54b40b
chore: resave naming series doctype schema
...
separate commit to avoid mixing actual changes
2022-05-26 15:15:59 +05:30
Rucha Mahabal
5c7451438f
Merge pull request #31130 from ruchamahabal/fix-job-opening
2022-05-26 13:23:44 +05:30
Rucha Mahabal
2bc6d46070
fix: validation message
2022-05-26 13:00:34 +05:30
Deepesh Garg
f49d8cd3b1
Merge pull request #31102 from alyf-de/german-translations-2022-05-23
...
feat: Add german translations
2022-05-26 11:49:56 +05:30
Vladislav
8d2502b5ba
chore: update ru translate
2022-05-26 11:48:38 +05:30
Rucha Mahabal
3f13b0ec97
Merge branch 'develop' into fix-job-opening
2022-05-26 11:38:35 +05:30
Rucha Mahabal
ab0ef60918
test: Job Opening against a Staffing Plan
2022-05-26 11:32:46 +05:30
sersaber
e5d2c1b1f3
fix: change project's actual_start_date fieldtype from Data to Date ( #31085 )
...
* Update project.json
* Update project.json
2022-05-26 10:04:58 +05:30
Saqib Ansari
ca75d814a3
fix: timesheet fetching in sales invoice
...
(cherry picked from commit 216c32f4bc13376335ae31bd09fe6b5c01855ba2)
2022-05-25 14:45:41 +00:00
xdlumertz
c5e922c76b
fix: Chart data for monthly periodicity in Cash Flow report ( #31039 )
...
fix: Chart data for monthly periodicity in Cash Flow report
2022-05-25 19:39:59 +05:30
Deepesh Garg
efa5b5b3db
Merge pull request #31038 from alyf-de/taxes-title-field
...
feat: show title when linking Taxes and Charges Template
2022-05-25 19:28:59 +05:30
Deepesh Garg
d68187caae
Merge branch 'develop' into loan_doc_reco_queries
2022-05-25 18:50:54 +05:30
Rucha Mahabal
29228575fa
fix: Job Opening linked to Staffing Plan cannot be created/updated if there are existing employees
2022-05-25 18:33:37 +05:30
Deepesh Garg
9e4a36089e
chore: Linting Issues
2022-05-25 18:10:42 +05:30
Deepesh Garg
a1f53f8d31
chore: Linting Issues
2022-05-25 17:59:40 +05:30
Deepesh Garg
147fc8fde7
fix: Loan Doc query in Bank Reconciliation Statement
2022-05-25 17:58:30 +05:30
Deepesh Garg
ac17ecb84b
Merge branch 'develop' into party_account_currency_check
2022-05-25 16:21:06 +05:30
Deepesh Garg
bc34737709
chore: Update test case
2022-05-25 15:42:47 +05:30
Deepesh Garg
96d8b1ef3c
feat: Auto accrue loan interest for backdated term loans
2022-05-25 14:19:10 +05:30
Deepesh Garg
6edbc58873
fix: Handle missing HSN Codes
...
(cherry picked from commit ce3a21eb039453d4786dfd0871a278b588039d80)
2022-05-25 07:04:44 +00:00
Saqib Ansari
268f413f56
fix(pos): paid amount calculation for multicurrency invoice ( #31112 )
2022-05-25 11:40:49 +05:30
Rucha Mahabal
273b21c0cb
chore: move patch for updating Employee Advance status to v13 ( #31118 )
2022-05-25 11:34:25 +05:30
Deepesh Garg
e75c843dc1
Merge pull request #31077 from deepeshgarg007/payroll_payable_party_type
...
fix: Loan repayment entries for payroll payable account
2022-05-25 11:23:43 +05:30
Deepesh Garg
d81fad09ea
Merge pull request #31080 from deepeshgarg007/company_address_trigger
...
fix(India): Async issue in company address trigger
2022-05-25 11:22:56 +05:30
marination
9f5f18e94d
style: Update docstrings and fix/add type hints + Collapsible progress section in Log
2022-05-25 11:22:13 +05:30
marination
ab2d95a74d
feat: Level-wise BOM cost updation
...
- Process BOMs level wise and Pause after level is complete
- Cron job will resume Paused jobs, which will again process the new level and pause at the end
- This will go on until all BOMs are updated
- Added Progress section with fields to track updated BOMs in Log
- Cleanup: Add BOM Updation utils file to contain helper functions/sub-functions
- Cleanup: BOM Update Log file will only contain functions that are in direct context of the Log
Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
2022-05-25 11:21:01 +05:30
Devin Slauenwhite
55276f11f8
fix: don't fetch item_code if already exists. ( #31113 )
...
fix: check if item_code exists before fetching
2022-05-25 09:35:22 +05:30
barredterra
1e9f9c452f
style: format
2022-05-24 13:31:29 +02:00
barredterra
1b16eb7667
refactor: set queries during setup
2022-05-24 13:30:59 +02:00
Raffael Meyer
e77c379cbb
fix: remove unsupported arguments
...
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2022-05-24 11:52:23 +02:00
Raffael Meyer
e3bc3bf0f0
Merge branch 'develop' into german-translations-2022-05-23
2022-05-24 11:41:46 +02:00
Ankush Menat
1ecb8f4a67
chore: disable feed for material request
2022-05-24 14:32:56 +05:30
Ankush Menat
ecb39d81e0
chore: error logging for auto material requests ( #31103 )
2022-05-23 20:06:24 +05:30
barredterra
2388d86623
feat: Add german translations
2022-05-23 16:01:36 +02:00
barredterra
9356eb11de
fix: german translations
2022-05-23 15:35:15 +02:00
barredterra
a6ddd86d31
fix: improve labels, simplify logic
2022-05-23 15:25:00 +02:00
barredterra
c704ad889d
style: format warehouse js
2022-05-23 15:18:24 +02:00
Ankush Menat
a36174afdf
test: search test failing because of stale data ( #31098 )
2022-05-23 15:12:11 +05:30
Ankush Menat
fa039b223e
Merge pull request #31054 from marination/jc-excess-transfer-config
...
fix: Job Card excess transfer behaviour
2022-05-23 14:43:36 +05:30
Suraj Shetty
f2b6475626
Merge pull request #31092 from surajshetty3416/fix-rfq-template
...
fix(rfq): Use `<a>` directly and style it as button instead of using `<button>`
2022-05-23 11:56:17 +05:30
Wolfram Schmidt
348a674df9
fix translation German "Designation" ( #31082 )
...
changed "Bezeichnung" to "Position" as the is more precice in the field of employment which erpnext refers to here
2022-05-23 11:23:12 +05:30
marination
9f6e10663b
chore: Run _validate_over_transfer only if excess transfer is blocked in settings
2022-05-23 11:05:55 +05:30
Suraj Shetty
9e306bd250
Merge branch 'develop' into fix-rfq-template
2022-05-23 10:48:22 +05:30
Rucha Mahabal
34e238ce4f
fix: Leave Encashment calculations ( #31062 )
2022-05-23 10:13:49 +05:30
Suraj Shetty
a29b92febc
fix: Use directly <a> and style it as button instead of using button
...
Since few email servers (like outlook) strips out link in the button making them unclickable.
2022-05-23 10:08:20 +05:30
Ankush Menat
1a58b788e5
Merge branch 'develop' into jc-excess-transfer-config
2022-05-21 14:32:44 +05:30
Ankush Menat
66cf9aa344
fix: creation of corrective job card fails
...
This used to fail because sub_operations is a child table that's not
initalized by default till v13, in develop branch we init tables with
empty list.
2022-05-21 14:01:30 +05:30
Ankush Menat
e625394488
test: simplify job card tests
2022-05-21 14:01:28 +05:30
ruthra kumar
dac678e3fc
test: payment ledger entry
2022-05-20 18:21:47 +05:30
ruthra kumar
e888975007
refactor: link payment ledger with gl entry creation
2022-05-20 18:21:47 +05:30
ruthra kumar
59ed7c854d
refactor: ignore linked Payment Ledger Entry in basic transactions
2022-05-20 18:21:47 +05:30
ruthra kumar
451cf3a937
refactor: helper class for ple creation and delinking
...
Helper functions for delinking ple and for creating payment ledger
entry for transactions on receivable/payable account types
2022-05-20 18:21:47 +05:30
ruthra kumar
7b1cb6711d
refactor: include Payment ledger in accounting dimensions list
2022-05-20 18:21:47 +05:30
ruthra kumar
8e72f19bfb
feat: patch to migrate gl entries to payment ledger
2022-05-20 18:21:47 +05:30
ruthra kumar
163085f201
feat: payment ledger doctype created
2022-05-20 18:21:47 +05:30
Deepesh Garg
8fd0b3b9f5
chore: Linting issues
2022-05-20 15:34:03 +05:30
Deepesh Garg
c41f9f046f
fix(India): Async issue in company address trigger
2022-05-20 15:33:03 +05:30
Deepesh Garg
3128f9603e
fix: Loan repayment entries for payroll payable account
2022-05-20 08:31:37 +05:30
Deepesh Garg
5edd1dbb35
Merge pull request #31004 from ruthra-kumar/bug_payment_terms_status_rpt
...
fix: duplicate entries in payment terms report output
2022-05-20 07:53:40 +05:30
marination
90d4dc0cd6
fix: test_work_order_with_non_stock_item
...
- Use the right price list and currency to avoid rate conversion (1000/62.9), since rates are reset correctly now
- Use RM rate based on Price List in BOM. Non stock item has no valuation
2022-05-20 03:12:42 +05:30
marination
dd99c00eb6
fix: Get fresh RM rate in calculate_rm_cost
2022-05-19 21:48:24 +05:30
marination
9a7e9d902d
perf: Use cached doc instead of get_doc
...
- Doc is only used to iterate over items(which wont change) and change rate/amount of rows
- These changes are inserted in db via `db_update`, so no harm
- Tested locally: refetching cached doc after db update, reflects fresh data.
2022-05-19 21:24:31 +05:30
Rucha Mahabal
7d4872aedd
patch: set payroll entry status
2022-05-19 20:35:56 +05:30
Rucha Mahabal
ef8164f188
refactor: UX for Salary Slip creation and submission via Payroll Entry
...
- Add status for Queued/Failed
- log errors and show corrective actions in payroll entry
2022-05-19 20:33:55 +05:30
marination
9dc3083088
fix: Call calculate_cost for Draft BOM and typo in argument
2022-05-19 20:33:48 +05:30
marination
5932e9d78a
fix: DB update child items, remove redundancy, fix perf
...
- Move `get_boms_in_bottom_up_order` in bom update tool’s file
- Remove repeated rm cost update from `update_cost`. `calculate_cost` handles RM cost update
- db_update children in `calculate_cost` optionally
- Don’t call `update_exploded_items` and regenerate exploded items in `update_cost`. They will stay the same (except cost)
2022-05-19 20:22:13 +05:30
Ankush Menat
6d6616dbcd
fix: always update item_name for stock entry ( #31068 )
...
If item_name is already set and for some reason becomes outdated then
it's not updated in backend.
Fix: always set item_name and stock_uom when fetching item details
2022-05-19 14:25:47 +05:30
Ankush Menat
1de6b14d15
fix: remove "scrap %" field ( #31069 )
...
This does nothing, there's scrap items table below that's actually used
for specifying scrap.
2022-05-19 14:25:16 +05:30
Rucha Mahabal
81c82c8d53
fix(ux): inform the user about salary slip creation/submission happening in the background
2022-05-19 13:41:11 +05:30
marination
b6e46eea80
perf: get_boms_in_bottom_up_order
...
- Create child-parent map once and fetch value from child key to get parents
- Get parents recursively for a leaf node (get all ancestors)
- Approx. 44 secs for 4lakh 70k boms
2022-05-18 13:00:00 +05:30
Saqib Ansari
9fb7b49b43
fix(india): error while parsing e-invoice ( #31053 )
2022-05-18 11:53:00 +05:30
maharshivpatel
65d55ea8fa
fix(india): eway bill cancel api is disabled ( #31055 )
2022-05-18 11:52:31 +05:30
marination
e07ce6efe0
fix: Job Card excess transfer behaviour
...
- Block excess transfer of items if not allowed in settings
- Behaviour made consistent with js behaviour (button disappears if not pending and not allowed in settings)
- Test for same case
2022-05-17 17:39:45 +05:30
Rucha Mahabal
28fe4f3d54
fix: unlink Attendance from Employee Checkins on cancellation ( #31045 )
2022-05-17 12:07:58 +05:30
Deepak
867f2c6282
fix: TypeError in add_indicator_for_multicompany ( #31042 )
...
Minor fix in add_indicator_for_multicompany
In case of multi-company transactions add (+) buttons in connection dashboard pf customer aren't being loaded due to TypeError (TypeError: e.dashboard.stats_area.removeClass is not a function) created by "frm.dashboard.stats_area.removeClass('hidden');" during the stats section creation.
2022-05-17 11:52:52 +05:30
Saqib Ansari
f915a9cef7
fix: discount ledger entry in case of multicurrency invoice ( #31024 )
2022-05-17 11:22:01 +05:30
barredterra
cad64f19b7
feat: show title field for Sales Taxes and Charges
2022-05-16 16:19:53 +02:00
barredterra
9553319d87
feat: show title field for Purchase Taxes and Charges
2022-05-16 16:19:32 +02:00
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
Marica
06c036f49f
Merge pull request #30834 from ankush/transfer_precision
...
fix: precision loss when transferring
2022-05-16 16:00:06 +05:30
Ankush Menat
c3bfc395b7
chore: disable flaky test
2022-05-16 15:50:04 +05:30
Rucha Mahabal
1b7ce9649b
fix: IN time not captured in Attendance through Employee Checkin ( #31029 )
2022-05-16 15:45:00 +05:30
Vladislav
af1eab5d54
fix(translations): Update ru translations ( #30992 )
...
* fix incorrect translation
* Update ru.csv
* Update ru.csv
* Update erpnext/translations/ru.csv
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2022-05-16 15:18:33 +05:30
Marica
eba1c89ba9
Merge pull request #31026 from ankush/item_attr_limit
...
fix: remove item attribute limit from variant selector
2022-05-16 14:10:11 +05:30
Marica
e3d53413d1
Merge pull request #31025 from ankush/hide_variants_order
...
fix: hide template items from sales/purchase order
2022-05-16 13:59:57 +05:30
Devin Slauenwhite
d76e1b7576
feat: barcode scanner promise to return scanned row. ( #31018 )
...
* feat: barcode scanner promise to return scanned row.
* fix: missing reject at alternate code path
2022-05-16 13:14:26 +05:30
Ankush Menat
6bd1cb9235
fix: remove item attribute limit from variant selector
2022-05-16 12:28:52 +05:30
Ankush Menat
0e875f5049
fix: hide template items from sales/purchase order
2022-05-16 12:14:07 +05:30
Deepesh Garg
a412d2f7e8
Merge pull request #31019 from frappe/mergify/bp/develop/pr-30978
...
fix: Multiple fixes in GST reporting (backport #30978 )
2022-05-16 11:54:17 +05:30
Ankush Menat
80d959c579
fix: dont fail repost for recoverable errors ( #30979 )
...
recoverable erros:
1. timeout
2. lock/deadlocks
2022-05-16 11:23:35 +05:30
Deepesh Garg
65232edfd5
test: Update test cases
2022-05-16 10:52:58 +05:30
Deepesh Garg
b2d24e2f93
chore: Linting issues
2022-05-16 10:40:55 +05:30
Deepesh Garg
5b8726405d
fix: Remove validation from Journal Entry
2022-05-15 21:10:52 +05:30
Deepesh Garg
8221852c38
Merge pull request #31010 from abhinavxd/fix-miniscule-penalty
...
fix: GL entry validation for minuscule loan penalty
2022-05-15 20:50:50 +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
Deepesh Garg
f83e32ab64
chore: resolve conflicts
2022-05-15 20:43:47 +05:30
Deepesh Garg
9b6197ec4a
chore: resolve conflicts
2022-05-15 20:42:34 +05:30
Deepesh Garg
03b133520b
chore: Remove unintended changes
...
(cherry picked from commit 5b02b5b3cd98a20a5a07dd83280acd548998ebf0)
# Conflicts:
# erpnext/__init__.py
2022-05-15 15:04:23 +00:00
Deepesh Garg
4ca7a3de4e
fix: Just add one rate in GST HSN Code
...
(cherry picked from commit ed76687dac52b81df2b9a415b8ce88c648da1446)
2022-05-15 15:04:22 +00:00
Deepesh Garg
481752134f
fix: Add validation for SEZ and Export invoices without payment of taxes
...
(cherry picked from commit cb8453dac8c38aed201f84c51f27ae217cc1f465)
2022-05-15 15:04:21 +00:00
Deepesh Garg
5ac4bf9750
chore: Linting Issues
...
(cherry picked from commit 8af30bcc160c335f2d0898e52af85fd7673ba903)
2022-05-15 15:04:20 +00:00
Deepesh Garg
edb3ef7222
fix: UOM in HSN-wise summary of outward supply
...
(cherry picked from commit cd7d5cdb2201b904bcf5ccfdcb1c4f29cd7e1369)
2022-05-15 15:04:19 +00:00
Frappe PR Bot
c1f47d36cf
chore(release): Bumped to Version 13.29.0
...
# [13.29.0](https://github.com/frappe/erpnext/compare/v13.28.0...v13.29.0 ) (2022-05-10)
### Bug Fixes
* Consider paryt and party type as well in group by consolidated view ([189fc89](189fc89e2d#30909 ](https://github.com/frappe/erpnext/issues/30909 )) ([#30910 ](https://github.com/frappe/erpnext/issues/30910 )) ([d60a6cb](d60a6cb2f80db3013c9b363752510eb7e1d40e43#30948 ](https://github.com/frappe/erpnext/issues/30948 )) ([c46add3](c46add3760#30879 ](https://github.com/frappe/erpnext/issues/30879 )) ([98d799e](98d799e7cc#30941 ](https://github.com/frappe/erpnext/issues/30941 )) ([7ce5c93](7ce5c93f44964de1fc69#30929 ](https://github.com/frappe/erpnext/issues/30929 )) ([9189653](9189653f2e#30936 ](https://github.com/frappe/erpnext/issues/30936 )) ([a0e39db](a0e39db200#30931 ](https://github.com/frappe/erpnext/issues/30931 )) ([#30932 ](https://github.com/frappe/erpnext/issues/30932 )) ([80f7d66](80f7d66255c449b35cc1#30838 ](https://github.com/frappe/erpnext/issues/30838 )) ([bf2eaec](bf2eaecb1d#30891 ](https://github.com/frappe/erpnext/issues/30891 )) ([#30893 ](https://github.com/frappe/erpnext/issues/30893 )) ([c458e14](c458e14e684f4af523e0e27fb58130#30937 ](https://github.com/frappe/erpnext/issues/30937 )) ([b7e873b](b7e873b55dfc35323106d53228b153#30940 ](https://github.com/frappe/erpnext/issues/30940 )) ([#30944 ](https://github.com/frappe/erpnext/issues/30944 )) ([64440fc](64440fc4fb#30924 ](https://github.com/frappe/erpnext/issues/30924 )) ([4ef2ffd](4ef2ffd14c#30946 ](https://github.com/frappe/erpnext/issues/30946 )) ([7bd5b2b](7bd5b2ba29#30923 ](https://github.com/frappe/erpnext/issues/30923 )) ([b96f156](b96f1565c5
2022-05-15 15:04:18 +00:00
Frappe PR Bot
b3964ee35b
chore(release): Bumped to Version 13.28.0
...
# [13.28.0](https://github.com/frappe/erpnext/compare/v13.27.1...v13.28.0 ) (2022-05-03)
### Bug Fixes
* Consistent accounting dimensions across Sales and Purchase docs ([5df5058](5df50588cf#30835 ](https://github.com/frappe/erpnext/issues/30835 )) ([#30866 ](https://github.com/frappe/erpnext/issues/30866 )) ([37fad7e](37fad7e04c22e7f03a03#30822 ](https://github.com/frappe/erpnext/issues/30822 )) ([3cdbb65](3cdbb65b5aee54bf7fe2#30814 ](https://github.com/frappe/erpnext/issues/30814 )) ([#30877 ](https://github.com/frappe/erpnext/issues/30877 )) ([246869d](246869dd282e62d518e8#30863 ](https://github.com/frappe/erpnext/issues/30863 )) ([#30883 ](https://github.com/frappe/erpnext/issues/30883 )) ([a1b0813](a1b0813966#30865 ](https://github.com/frappe/erpnext/issues/30865 )) ([5a5b49b](5a5b49b61ab01f8555e5edbf5513dafdcc591a5ecf087103cb93482f3302#30870 ](https://github.com/frappe/erpnext/issues/30870 )) ([#30871 ](https://github.com/frappe/erpnext/issues/30871 )) ([57b03f0](57b03f0bf2#30846 ](https://github.com/frappe/erpnext/issues/30846 )) ([f7bf4a3](f7bf4a3e62d5319a4826#30857 ](https://github.com/frappe/erpnext/issues/30857 )) ([#30859 ](https://github.com/frappe/erpnext/issues/30859 )) ([7ee18e8](7ee18e86a2#30762 ](https://github.com/frappe/erpnext/issues/30762 )) ([#30826 ](https://github.com/frappe/erpnext/issues/30826 )) ([645ee2d](645ee2d822
2022-05-15 15:04:17 +00:00
Frappe PR Bot
e66aab77cb
chore(release): Bumped to Version 13.27.1
...
## [13.27.1](https://github.com/frappe/erpnext/compare/v13.27.0...v13.27.1 ) (2022-04-26)
### Bug Fixes
* Add accounting dimensions for round off GL Entry ([dedb90e](dedb90ea72#30770 ](https://github.com/frappe/erpnext/issues/30770 )) ([#30771 ](https://github.com/frappe/erpnext/issues/30771 )) ([c339305](c339305e9c1834671d59#30726 ](https://github.com/frappe/erpnext/issues/30726 )) ([#30772 ](https://github.com/frappe/erpnext/issues/30772 )) ([a6d0938](a6d0938591153b41a2693a5f5d5cd086c5f4db85a2d95fc62bdc2f694547198bdcfdc6#30800 ](https://github.com/frappe/erpnext/issues/30800 )) ([f70fca1](f70fca1c9e#30736 ](https://github.com/frappe/erpnext/issues/30736 )) ([6291b28](6291b28c376dddbb9f27e69c71576de76220e819#30748 ](https://github.com/frappe/erpnext/issues/30748 )) ([0b4e3f1](0b4e3f1467#29072 ](https://github.com/frappe/erpnext/issues/29072 )) ([#30755 ](https://github.com/frappe/erpnext/issues/30755 )) ([b656ffa](b656ffa45ebed9e0915344f0b69152#29085 ](https://github.com/frappe/erpnext/issues/29085 )) ([ea0fe5e](ea0fe5e10cf9d89c7f9d89c7ce6#30781 ](https://github.com/frappe/erpnext/issues/30781 )) ([#30783 ](https://github.com/frappe/erpnext/issues/30783 )) ([8335ca6](8335ca6331baab3797ca#30725 ](https://github.com/frappe/erpnext/issues/30725 )) ([#30776 ](https://github.com/frappe/erpnext/issues/30776 )) ([b585262](b585262842fe9f32946c#30745 ](https://github.com/frappe/erpnext/issues/30745 )) ([269e192](269e1923c934437a83df
2022-05-15 15:04:17 +00:00
Deepesh Garg
c6b98d8de9
fix: Multiple fixes in GSTR-1 report
...
(cherry picked from commit f2cbb703252564149620a26d6f52800b18c53632)
# Conflicts:
# erpnext/regional/report/gstr_1/gstr_1.py
2022-05-15 15:04:16 +00:00
Deepesh Garg
a8da657f81
Merge branch 'develop' into fix-miniscule-penalty
2022-05-14 21:36:27 +05:30
hrzzz
3c35c9b6ae
fix: correction of the calculation to the average value when there is a discount on the document and not on the items
2022-05-14 10:45:26 -03:00
Rohit Waghchaure
69be22ba7c
fix: select multiple values for accounting dimenssion
2022-05-14 17:19:34 +05:30
Rucha Mahabal
ead08aa192
Merge pull request #31013 from ruchamahabal/hr-reports-emp-status
...
feat: add Employee Status filter in leave balance reports
2022-05-13 22:07:08 +05:30
Rucha Mahabal
260cfa5d1e
test: employee status filter in leave balance reports
2022-05-13 21:02:09 +05:30
Rucha Mahabal
08fb9a4318
fix: translation for status filter
2022-05-13 20:44:35 +05:30
Rucha Mahabal
ed8a49737a
feat: add Employee Status filter in leave balance reports
2022-05-13 20:23:32 +05:30
Rucha Mahabal
3016ed958e
fix(Employee Advance): Return/Deduction from Salary button visibility ( #31011 )
2022-05-13 20:01:14 +05:30
Ankush Menat
86df7f835a
fix: move healthcare patch to post_model_sync ( #31008 )
...
[skip ci]
2022-05-13 18:15:34 +05:30
Abhinav Raut
589dd17e58
fix: precision of total penalty paid
2022-05-13 17:56:27 +05:30
Abhinav Raut
9a86885c0a
fix: precision of total penalty paid
2022-05-13 17:55:16 +05:30
Abhinav Raut
aef65e7417
fix: gl entry validation for miniscule loan penalty
2022-05-13 17:22:26 +05:30
Ankush Menat
3263ecf54c
test: check translation files ( #31006 )
2022-05-13 16:38:04 +05:30
HarryPaulo
328b1b54d9
fix: payments duplicate on pos closing entry ( #30976 )
2022-05-13 15:06:02 +05:30
ruthra kumar
e826093150
fix: multiple entries for same payment term
2022-05-13 14:24:06 +05:30
Deepesh Garg
54d6cf18fc
fix: Item rate reset on changing posting date ( #30990 )
...
* fix: Item rate reset on changing posting date
* chore: Remove debugger
2022-05-13 13:07:23 +05:30
Marica
9a2b11f05f
Merge pull request #30911 from alyf-de/de-translate-employee
...
fix: German translations for Employee doctype
2022-05-13 12:23:13 +05:30
Marica
38e0105125
Merge pull request #30818 from Havenir/feat-request-for-quotation
...
feat: request_for_quotation - show supplier name
2022-05-13 12:16:23 +05:30
Wolfram Schmidt
c4a2778359
chore: added RFQ Link to Opportunity Dashboard ( #30894 )
...
added Link to Dashboard
added backlink to Request for Quotation in the Quotation dashboard for transparency and ease of navigation.
2022-05-13 12:01:52 +05:30
Wolfram Schmidt
0bbed414f8
feat: add Link to Opportunity ( #30614 )
...
Adding Link to Opportunity
Following the process of Opportunity to Quotation I added a section and link field to Opportunity for a backlink when using "create"-> Request for Quotation from Opportunity.
2022-05-13 11:59:45 +05:30
Ankush Menat
b08180092e
fix(patch): avoid checking for return field if it doesnt exits ( #30995 )
...
fix(patch): avoid checking for qty field if it doesnt exits
2022-05-13 11:55:47 +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
Deepesh Garg
b13698a1d5
fix: Failing accounting dimension patch
...
(cherry picked from commit b14a7b8a5db2512f365efb75b9cc75ee3c3fa213)
2022-05-12 09:27:40 +00:00
Marica
5b8c7438cc
Merge pull request #30945 from ankush/stock_analytics_fix
...
fix: stock analytics report shows incorrect data there's no stock movement in a period
2022-05-12 12:26:54 +05:30
Saqib Ansari
6c16422beb
test: sales_invoice_with_disabled_account
2022-05-12 12:05:53 +05:30
Saqib Ansari
92613777b9
test: payment_entry_against_onhold_purchase_invoice
2022-05-12 11:17:36 +05:30
Ankush Menat
b1c90e9949
fix: stock transfer value when precision differs
2022-05-12 11:09:30 +05:30
Marica
3d96ad2afa
Merge pull request #30950 from marination/actual-qty-total-js-reactive
...
fix: Set actual qty and basic rate in SE on warehouse triggers (`get_warehouse_details`)
2022-05-11 20:13:54 +05:30
Ankush Menat
ab80783e3a
refactor: single function to fetch related row
...
There was separate function for batch row which frequently didn't
receive all the love main function received like:
1. empty row reuse
2. max qty validation
Hence it makes sense to combine these in one fat function
2022-05-11 19:27:16 +05:30
Ankush Menat
2f1d118f36
fix: disable serial no scanning for picklist
...
Current design of picklist doc doesn't have "picked serial no" so it
doesn't make much sense to scan it. Instead it should increment qty
only. Might add this in future after fixing UX problems
2022-05-11 18:56:22 +05:30
Ankush Menat
d35a13ec7e
refactor: change alert duration to 3 and modern js
2022-05-11 18:52:14 +05:30
Ankush Menat
7f14222700
docs: document barcode_scanner API
2022-05-11 18:45:31 +05:30
Ankush Menat
372d2d870e
fix: better message for picked qty shortfall
2022-05-11 18:43:10 +05:30
Ankush Menat
d3121fd845
fix(UX): hide scan section for non-draft docs
2022-05-11 18:40:44 +05:30
Ankush Menat
a4f0be6c5e
Merge branch 'develop' into feat-picklist-scan
2022-05-11 18:38:53 +05:30
Marica
d024f72ab8
Merge branch 'develop' into actual-qty-total-js-reactive
2022-05-11 18:02:20 +05:30
marination
4fa15b50ca
test: Test for mapped SE and fix for failing tests
...
- Remove `set_missing_values` from mapper util function since a lot of item data is set after this function is run
- `split_batch` can skip `set_missing_values` since no warehouses are set on mapping and relies on user input
2022-05-11 17:58:48 +05:30
Sagar Sharma
1a70701eca
fix: per_billed for return DN ( #30868 )
...
* fix: per_billed for return DN
* chore: move patch from v14 to v13
2022-05-11 16:49:28 +05:30
Vladislav
40d2f94abd
chore: incorrect translation ( #30966 )
2022-05-11 16:26:48 +05:30
marination
90a8e924f5
fix: set_missing_values in SE and re-use the same on all SE mappings
...
- `set_missing_values` in SE will set actual qty, transfer qty and calculate rate/amount
- Re-use `set_missing_values` wherever SE is doc is being mapped
2022-05-11 14:54:22 +05:30
Ankush Menat
f6d6463a33
chore: fifo queue vs qty after transaction comparison report
2022-05-11 14:43:03 +05:30
Saqib Ansari
95b059a98c
fix: validate disabled accounts before posting ledger entries
2022-05-11 13:26:15 +05:30
Saqib Ansari
a1e3ae8869
fix: user can select disabled accounts in taxes table
2022-05-11 13:01:06 +05:30
Saqib Ansari
b0f302e579
fix: validate on hold purchase invoices in payment entry
2022-05-11 12:42:35 +05:30
Marica
061cd3220f
Merge branch 'develop' into update-items-zero-qty
2022-05-11 11:42:39 +05:30
Raffael Meyer
195e8af985
Merge branch 'develop' into de-translate-employee
2022-05-10 15:57:40 +02:00
marination
0c9154389b
fix: Block 0 Qty via Update Items to be consistent with form validation
2022-05-10 18:09:07 +05:30
Ankush Menat
15fdc1cf7f
Merge pull request #30958 from gavindsouza/dashboard-chart-fixes
...
fix(charts): Pass fieldtype for chart data in selling reports
2022-05-10 17:40:01 +05:30
Gavin D'souza
7bf0e4f8e5
fix(charts): Pass fieldtype for chart data in selling reports
2022-05-10 15:58:31 +05:30
Ankush Menat
198b91f8d4
fix: only carry-forward balances till today's period
...
Showing data in future doesn't make sense. Only carry-forward till last
bucket that contains today's day.
2022-05-10 15:38:02 +05:30
Ankush Menat
287b255ad6
fix: batch_no doesn't maintain qty_after_transaction
2022-05-10 15:38:02 +05:30
Ankush Menat
6ab0046e9c
fix: consider previous balance is missing
...
Also remove `total`, total of total is a meaningless value.
2022-05-10 15:38:02 +05:30
Ankush Menat
d81422fb58
test: basic test for stock analytics report
2022-05-10 15:38:02 +05:30
Ankush Menat
d25841369d
Merge pull request #30913 from ankush/against_voucher_processing
...
fix: double future qty updates
2022-05-10 14:46:37 +05:30
marination
494ddd1eb4
fix: Calculate totals even though pricing rule is not applied on mapped doc
...
- `apply_pricing_rule` is triggered due to change in some data which most likely contributes to Total.
2022-05-10 14:02:43 +05:30
Saqib Ansari
8dd046cc51
fix(india): invoice type for a debit note e-invoice ( #30948 )
2022-05-10 13:39:41 +05:30
Ankush Menat
3b6752dc8b
Merge pull request #30938 from rohitwaghchaure/formatting-for-to-discuss-field
...
fix: allow to use formatting for the field to_discuss in opportunity
2022-05-10 12:10:42 +05:30
Saqib Ansari
cf13a20438
feat(india): generate qrcode button for e-invoice ( #30939 )
2022-05-10 12:07:47 +05:30
Rohit Waghchaure
3f41cb762d
fix: allow to use formatting for the field to_discuss in opportunity
2022-05-10 11:47:01 +05:30
Rucha Mahabal
51fcbe5826
feat(HR): Leave Type configuration to allow over allocation ( #30940 )
2022-05-09 21:29:58 +05:30
Ankush Menat
f047fa1aa8
Merge pull request #30942 from frappe/mergify/bp/develop/pr-30869
...
fix: Unlink and delete batch created from stock reco on cancel (backport #30869 )
2022-05-09 19:38:03 +05:30
Ankush Menat
05dd1d6d15
refactor: tax rule validity query ( #30934 )
2022-05-09 19:26:13 +05:30
marination
a65b20d976
style: Spaces to Tabs
...
(cherry picked from commit a2fff8741e7ea928c4152d8f867db3ef9eb08b19)
2022-05-09 13:32:45 +00:00
marination
9fd673e498
fix: Remove commit from stock entry test. The assertion is not important
...
(cherry picked from commit c449b35cc11615fc7d9e616c2038b9e90c3957d6)
2022-05-09 13:32:44 +00:00
marination
64f3b4d68b
fix: Wrap SLE actual_qty in flt to avoid NoneType operation
...
- Since Batch cancellation SLEs do not set qtys (will fix separately), `merge_similar_entries` gets `actual_qty` as None
- This causes NoneType operation error on tests that cancel batch-serial reco
- Modified tests to avoid using commit and rollback explicitly
(cherry picked from commit d53228b153437f9dedcb1229bf579411f3122729)
2022-05-09 13:32:43 +00:00
marination
de3d90c5ab
fix: Item Alternative Test
...
(cherry picked from commit 964de1fc69b32d377f8c2a6f15d6ab7381669606)
2022-05-09 13:32:42 +00:00
marination
14ea40d270
chore: Tests for Stock Reconciliation
...
(cherry picked from commit 5bc5af1066e0bb4bead98598ed4bf9911d340734)
2022-05-09 13:32:41 +00:00
marination
3bc3cf34eb
chore: Tests for Stock Entry
...
(cherry picked from commit a144548db95ec829b953ca6305fe898b1a9cdeb0)
2022-05-09 13:32:40 +00:00
marination
577df1753e
fix: Unlink and delete batch created from stock reco on cancel
...
(cherry picked from commit fc353231065f1c33890d5b7e55c2e4e2506d986d)
2022-05-09 13:32:37 +00:00
maharshivpatel
e5ebbf4799
fix(india): re-arrange e-way bill dialog fields ( #30920 )
2022-05-09 18:20:20 +05:30
HarryPaulo
ebbe27c183
fix: subtract change_amount from paid_amount field on POS Register ( #30922 )
2022-05-09 15:14:57 +05:30
Saqib Ansari
867494edad
fix(pos): creating pos returns resets pricing rules & discounts ( #30935 )
2022-05-09 15:05:05 +05:30
Deepesh Garg
dbb37aefae
Merge pull request #30926 from frappe/mergify/bp/develop/pr-30065
...
fix: HSN-wise-summary of outward supplies Updated Report (backport #30065 )
2022-05-09 13:21:58 +05:30
Ankush Menat
7e2fbc050a
fix: sort before picking next stock reco
2022-05-09 13:16:02 +05:30
marination
1ce45f623e
fix: Set actual qty and basic rate in SE on warehouse triggers (get_warehouse_details)
...
- set `actual_qty` on source and target warehouse change
2022-05-09 13:00:00 +05:30
Rucha Mahabal
f92bc4dd33
fix: remove check for already allocated earned leaves ( #30931 )
...
* fix: remove check for already allocated earned leaves
* fix: do not set New Leaves Allocated field as read-only for earned leaves
- removing this until there's a better way to update existing allocations
2022-05-09 12:15:02 +05:30
Ankush Menat
ae842d8145
chore: remove datettime formatting from debug report
...
This hides some information that would otherwise help during debugging
2022-05-09 11:29:00 +05:30
Ankush Menat
7c839c4503
fix: double future qty updates
...
update_qty_in_future_sle is reprocessing rows which are already
processed by process_sle_against_current_voucher
2022-05-09 11:28:21 +05:30
Deepesh Garg
c9f6405b2a
chore: Resolve conflicts
2022-05-09 10:33:03 +05:30
Deepesh Garg
b3d5c74df5
Merge branch 'develop' of https://github.com/frappe/erpnext into mergify/bp/develop/pr-30065
2022-05-09 10:21:46 +05:30
Ankush Menat
95e41b0d48
chore: correct version in hooks
...
[skip ci]
2022-05-08 22:04:14 +05:30
Deepesh Garg
85c137b3aa
chore: Remove print statement
...
(cherry picked from commit a8fbd2451b498ad49356cf0e6a710616ab802465)
2022-05-08 14:07:00 +00:00
Deepesh Garg
3ae4b9033f
chore: Remove extra columns
...
(cherry picked from commit b0e929b8ae8780ada76ea6b699a2b4d840b31487)
# Conflicts:
# erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py
2022-05-08 14:07:00 +00:00
Govind S Menokee
d99b4e29b9
fix: HSN-wise-summary of outward supplies Updated Report
...
Report changes done in order to meet the specification as per govt guideline - [GUIDELINE](https://taxguru.in/goods-and-service-tax/12-points-note-filing-gstr-1-01st-2021-onwards.html )
(cherry picked from commit 363752510ead7d3b86693d3659b2157753f2762d)
# Conflicts:
# erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py
2022-05-08 14:06:58 +00:00
maharshivpatel
b8dc40b7a0
feat(india): cancel e-way bill is enabled with e-invoicing APIs. ( #30888 )
2022-05-07 18:59:27 +05:30
maharshivpatel
b825179286
feat(india): store e-way bill auto calculated distance in sales invoice ( #30908 )
2022-05-07 18:46:12 +05:30
Raffael Meyer
f3ad4f3c3b
Merge branch 'develop' into de-translate-employee
2022-05-06 19:57:42 +02:00
Rucha Mahabal
7f1024f8aa
feat(minor): fetch default salary structure and base from Employee Grade in Salary Structure Assignment ( #30918 )
2022-05-06 17:44:30 +05:30
Deepesh Garg
c05144fb60
Merge pull request #30897 from deepeshgarg007/general_ledger_consolidated
...
fix: Consider party and party type as well in group by consolidated view
2022-05-06 13:10:00 +05:30
Deepesh Garg
f255741b16
Merge pull request #30855 from Altizo/develop
...
fix: update translate
2022-05-06 13:04:24 +05:30
Deepesh Garg
d5dca69090
Merge pull request #30901 from alyf-de/translate-party
...
feat(German Translation)!: translate "Party" as "Partei"
2022-05-06 13:02:27 +05:30
Deepesh Garg
cf4128edba
Merge pull request #30900 from alyf-de/bank-account-website
...
feat: remove website from bank account
2022-05-06 13:01:28 +05:30
Ahmad
458f2fcd62
Merge branch 'develop' into feat-request-for-quotation
2022-05-06 11:54:07 +05:00
maharshivpatel
ee7a7eb782
fix(india): keyerror while generating e-way bill from an e-invoice ( #30879 )
2022-05-06 11:23:16 +05:30
barredterra
02b38a439f
fix: german translations for Employee
2022-05-05 20:37:51 +02:00
Devin Slauenwhite
e9cf5cb4b0
feat: add prompt qty flag to pick list
2022-05-05 10:47:06 -04:00
Devin Slauenwhite
0a77c28594
fix: cast value to Number type
2022-05-05 10:46:40 -04:00
Devin Slauenwhite
47b4251844
feat: prompt qty on scan
2022-05-05 09:39:19 -04:00
Ankush Menat
f31122cbc3
fix: disable form save on naming series tool ( #30909 )
2022-05-05 17:35:58 +05:30
Ankush Menat
ad7c113c0d
test: activation
2022-05-05 11:02:23 +05:30
Aditya Hase
912c1d0a1b
chore: Remove reference to Instructor doctype ( #30903 )
...
References:
https://github.com/frappe/erpnext/pull/30830
44c54f69f8
2022-05-05 10:40:42 +05:30
Ankush Menat
d48ab81622
fix: auto-fulfill picking list when not in scan mode
2022-05-04 12:43:31 -04:00
Devin Slauenwhite
7ae89dedd5
fix: cleanup dont_allow_new_row logic
2022-05-04 11:06:16 -04:00
Devin Slauenwhite
5560ceca62
fix: max qty message
...
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2022-05-04 10:32:21 -04:00
Devin Slauenwhite
4a19c1c19d
Revert "fix(test): manually select picked_qty since before_submit validates qty instead of auto filling it"
...
This reverts commit c2335ec0
2022-05-04 10:29:52 -04:00
Deepesh Garg
826c3f5c63
Merge pull request #30899 from deepeshgarg007/timesheet_link
...
fix: Show linked time sheets in sales invoice dashboard
2022-05-04 19:54:06 +05:30
barredterra
5435da6d2b
feat(German Translation): translate "Party" as "Partei"
2022-05-04 16:20:20 +02:00
barredterra
f1b8a969cf
feat: remove website from bank account
2022-05-04 15:51:52 +02:00
Deepesh Garg
3e38dc7ea8
fix: Show linked time sheets in sales invoice dashboard
2022-05-04 17:30:52 +05:30
Deepesh Garg
c2d52a1ac0
fix: Consider paryt and party type as well in group by consolidated view
2022-05-04 15:59:24 +05:30
Deepesh Garg
8535ad46e9
Merge pull request #30882 from fproldan/issue_25414
...
fix: "Supplier Quotation Comparison" - Tools - Select Default Supplier
2022-05-04 14:23:17 +05:30
Ankush Menat
91cd5f5d4a
fix: show group warehouse in Sales Order ( #30891 )
2022-05-04 13:07:58 +05:30
Deepesh Garg
e8d6eb207d
fix: Ignore loan repayments made from salary slip
...
(cherry picked from commit b7e1d40e43c136f0e967111e10af95ddc80e2fd5)
2022-05-04 04:15:07 +00:00
Devin Slauenwhite
5d8e3f264c
Merge branch 'feat-picklist-scan' of /home/devin/repos/erpnext into feat-picklist-scan
2022-05-03 16:28:54 -04:00
Devin Slauenwhite
c2335ec0d8
fix(test): manually select picked_qty since before_submit validates qty instead of auto filling it
2022-05-03 16:28:28 -04:00
Francisco Roldán
5604dccdb6
Merge branch 'develop' into issue_25414
2022-05-03 13:27:10 -03:00
Devin Slauenwhite
afb841c771
Merge branch 'develop' into feat-picklist-scan
2022-05-03 11:15:42 -04:00
Deepesh Garg
322f0db1e9
chore: Resolve conflicts
2022-05-03 18:28:50 +05:30
Deepesh Garg
2e3e666784
Merge branch 'develop' of https://github.com/frappe/erpnext into erpnext_setup_cleanup
2022-05-03 18:17:36 +05:30
Francisco Roldán
288e2258f6
Merge branch 'develop' into issue_25414
2022-05-03 08:48:30 -03:00
Rucha Mahabal
924cf7763e
fix: payment days calculation for employees joining/leaving mid-month ( #30863 )
2022-05-03 11:27:25 +05:30
Francisco Roldan
26654e5e29
fix: supplier quotation comparission report button
2022-05-02 21:07:54 -03:00
Devin Slauenwhite
6cc83d658b
Merge branch 'feat-picklist-scan' of github.com:dj12djdjs/erpnext into feat-picklist-scan
2022-05-02 17:20:48 -04:00
