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
Deepesh Garg
a5677d963f
Merge pull request #31133 from frappe/mergify/bp/develop/pr-31124
...
fix: timesheet fetching in sales invoice (backport #31124 )
2022-05-25 22:57:54 +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
e73a0a89b0
Merge pull request #31129 from deepeshgarg007/loan_doc_reco_queries
...
fix: Loan Doc query in Bank Reconciliation Statement
2022-05-25 19:21:30 +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
b562168509
Merge pull request #26916 from deepeshgarg007/party_account_currency_check
...
fix: Account currency validation for first transaction
2022-05-25 17:02:58 +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
e8f44445fd
Merge pull request #31125 from frappe/mergify/bp/develop/pr-31123
...
fix: Handle missing HSN Codes (backport #31123 )
2022-05-25 13:32:41 +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
