Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,235 Commits 3 Branches 0 Tags 1 GiB
d6078aa911
Commit Graph

42235 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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