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
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
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
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
3019f93915
Merge pull request #31083 from ankush/jc_corrective_creation
...
fix: corrective job card creation
2022-05-21 14:28:08 +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
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
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
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
