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

32581 Commits

Author SHA1 Message Date
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))
* disable form save on naming series tool ([#30909](https://github.com/frappe/erpnext/issues/30909)) ([#30910](https://github.com/frappe/erpnext/issues/30910)) ([d60a6cb](d60a6cb2f8))
* double future qty updates ([0db3013](0db3013c9b))
* HSN-wise-summary of outward supplies Updated Report ([3637525](363752510e))
* Ignore loan repayments made from salary slip ([b7e1d40](b7e1d40e43))
* **india:** invoice type for a debit note e-invoice ([#30948](https://github.com/frappe/erpnext/issues/30948)) ([c46add3](c46add3760))
* **india:** keyerror while generating e-way bill from an e-invoice ([#30879](https://github.com/frappe/erpnext/issues/30879)) ([98d799e](98d799e7cc))
* **india:** re-arrange e-way bill dialog fields ([#30941](https://github.com/frappe/erpnext/issues/30941)) ([7ce5c93](7ce5c93f44))
* Item Alternative Test ([964de1f](964de1fc69))
* patch for renaming membership settings ([#30929](https://github.com/frappe/erpnext/issues/30929)) ([9189653](9189653f2e))
* **pos:** creating pos returns resets pricing rules & discounts ([#30936](https://github.com/frappe/erpnext/issues/30936)) ([a0e39db](a0e39db200))
* remove check for already allocated earned leaves ([#30931](https://github.com/frappe/erpnext/issues/30931)) ([#30932](https://github.com/frappe/erpnext/issues/30932)) ([80f7d66](80f7d66255))
* Remove commit from stock entry test. The assertion is not important ([c449b35](c449b35cc1))
* Set available-for-use date if missing ([#30838](https://github.com/frappe/erpnext/issues/30838)) ([bf2eaec](bf2eaecb1d))
* show group warehouse in Sales Order ([#30891](https://github.com/frappe/erpnext/issues/30891)) ([#30893](https://github.com/frappe/erpnext/issues/30893)) ([c458e14](c458e14e68))
* Show linked time sheets in sales invoice dashboard ([4f4af52](4f4af523e0))
* sort before picking next stock reco ([e27fb58](e27fb58130))
* subtract change_amount from paid_amount field on POS Register ([#30937](https://github.com/frappe/erpnext/issues/30937)) ([b7e873b](b7e873b55d))
* Unlink and delete batch created from stock reco on cancel ([fc35323](fc35323106))
* Wrap SLE actual_qty in `flt` to avoid NoneType operation ([d53228b](d53228b153))

### Features

* **HR:** Leave Type configuration to allow over allocation (backport [#30940](https://github.com/frappe/erpnext/issues/30940)) ([#30944](https://github.com/frappe/erpnext/issues/30944)) ([64440fc](64440fc4fb))
* **india:** cancel e-way bill is enabled with e-invoicing APIs. ([#30924](https://github.com/frappe/erpnext/issues/30924)) ([4ef2ffd](4ef2ffd14c))
* **india:** generate qrcode button for e-invoice ([#30946](https://github.com/frappe/erpnext/issues/30946)) ([7bd5b2b](7bd5b2ba29))
* **india:** store e-way bill auto calculated distance in sales invoice ([#30923](https://github.com/frappe/erpnext/issues/30923)) ([b96f156](b96f1565c5))

(cherry picked from commit 7369db59aacfeecac086930f2a6b373973db7a0c)

# Conflicts:
#	erpnext/__init__.py
 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))
* convert default_item_manufacturer to link field ([#30835](https://github.com/frappe/erpnext/issues/30835)) ([#30866](https://github.com/frappe/erpnext/issues/30866)) ([37fad7e](37fad7e04c))
* Cost center filter on payment reconciliation ([22e7f03](22e7f03a03))
* filters not working in Shift Assignment Calendar view ([#30822](https://github.com/frappe/erpnext/issues/30822)) ([3cdbb65](3cdbb65b5a))
* Ignore custom field validation while setup ([ee54bf7](ee54bf7fe2))
* **india:** e-invoice generation for registered composition gst category type ([#30814](https://github.com/frappe/erpnext/issues/30814)) ([#30877](https://github.com/frappe/erpnext/issues/30877)) ([246869d](246869dd28))
* Multi currency opening invoices ([2e62d51](2e62d518e8))
* payment days calculation for employees joining/leaving mid-month ([#30863](https://github.com/frappe/erpnext/issues/30863)) ([#30883](https://github.com/frappe/erpnext/issues/30883)) ([a1b0813](a1b0813966))
* Period Closing Voucher is considering GL entries with is_cancelled=1 ([#30865](https://github.com/frappe/erpnext/issues/30865)) ([5a5b49b](5a5b49b61a))
* **pos:** number pad translations ([b01f855](b01f8555e5))
* **pos:** search field doesn't reset on checkout ([edbf551](edbf5513da))
* Supply type for overseas invoices with payment of tax ([fdcc591](fdcc591a5e))
* supply type for sez invoices with payment of tax ([cf08710](cf087103cb))
* Use `account_type == 'Stock'` to filter stock accounts ([93482f3](93482f3302))
* **UX:** misleading stock entry lables ([#30870](https://github.com/frappe/erpnext/issues/30870)) ([#30871](https://github.com/frappe/erpnext/issues/30871)) ([57b03f0](57b03f0bf2))
* **UX:** record reason for skipping attendance or marking absent for auto attendance ([#30846](https://github.com/frappe/erpnext/issues/30846)) ([f7bf4a3](f7bf4a3e62))
* Vat Audit report fixes ([d5319a4](d5319a4826))

### Features

* Copy task color from project template (backport [#30857](https://github.com/frappe/erpnext/issues/30857)) ([#30859](https://github.com/frappe/erpnext/issues/30859)) ([7ee18e8](7ee18e86a2))
* support product bundles in picklist (backport [#30762](https://github.com/frappe/erpnext/issues/30762)) ([#30826](https://github.com/frappe/erpnext/issues/30826)) ([645ee2d](645ee2d822))

(cherry picked from commit 8cc2ea0ddbefb6722247a39a6568d65d4cf4cf5c)

# Conflicts:
#	erpnext/__init__.py
 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))
* batch_no filtering not working when batch no is also a number in scientific notation ([#30770](https://github.com/frappe/erpnext/issues/30770)) ([#30771](https://github.com/frappe/erpnext/issues/30771)) ([c339305](c339305e9c))
* Check if accounting dimension exists ([1834671](1834671d59))
* dependent gle reposting (backport [#30726](https://github.com/frappe/erpnext/issues/30726)) ([#30772](https://github.com/frappe/erpnext/issues/30772)) ([a6d0938](a6d0938591))
* Do not validate while creating accounting dimension ([153b41a](153b41a269))
* e_commerce_settings.js ([3a5f5d5](3a5f5d5cd0))
* e_commerce_settings.py ([86c5f4d](86c5f4db85))
* First preference to parent cost center rather than round off cost center ([a2d95fc](a2d95fc62b))
* Handle Multiselect field mapping separately ([dc2f694](dc2f694547))
* **india:** 401 & 403 client error while generating IRN ([198bdcf](198bdcfdc6))
* **india:** cess value not considered while validating e-invoice totals ([#30800](https://github.com/frappe/erpnext/issues/30800)) ([f70fca1](f70fca1c9e))
* **india:** transporter name is null while generating e-way bill ([#30736](https://github.com/frappe/erpnext/issues/30736)) ([6291b28](6291b28c37))
* linter ([6dddbb9](6dddbb9f27))
* Loan doctypes in bank reconciliation ([e69c715](e69c71576d))
* Mistyped variable name in patch ([e76220e](e76220e819))
* monthly attendance sheet ([#30748](https://github.com/frappe/erpnext/issues/30748)) ([0b4e3f1](0b4e3f1467))
* Must not be able to start Job Card if it is related to Work Order that is not started yet ([#29072](https://github.com/frappe/erpnext/issues/29072)) ([#30755](https://github.com/frappe/erpnext/issues/30755)) ([b656ffa](b656ffa45e))
* Query filter fields from Website Item instead of Item master ([bed9e09](bed9e09153))
* select doctype as payment_document ([44f0b69](44f0b69152))
* **Selling,E-Commerce:** Shopping cart quotation without website item. ([#29085](https://github.com/frappe/erpnext/issues/29085)) ([ea0fe5e](ea0fe5e10c))
* SO analysis rpt will fetch SO's without Delivery note as well ([f9d89c7](f9d89c7ce6))
* translation ([#30781](https://github.com/frappe/erpnext/issues/30781)) ([#30783](https://github.com/frappe/erpnext/issues/30783)) ([8335ca6](8335ca6331))
* Update token to allow updates on protected branch ([baab379](baab3797ca))
* update translation ([#30725](https://github.com/frappe/erpnext/issues/30725)) ([#30776](https://github.com/frappe/erpnext/issues/30776)) ([b585262](b585262842))
* Use parent cost center for Sales and Purchase Invoice ([fe9f329](fe9f32946c))
* Use right precision for asset value after full schedule ([#30745](https://github.com/frappe/erpnext/issues/30745)) ([269e192](269e1923c9))
* Validate field filter wrt to Website Item & re-use validation in Item Group ([34437a8](34437a83df))

(cherry picked from commit 096dcf0e54dcaed5bf6fd9050e7da565e08fd440)

# Conflicts:
#	erpnext/__init__.py
 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
maharshivpatel
80a13c38bc
fix(india): e-invoice generation for registered composition gst category type (#30814) 2022-05-02 21:51:27 +05:30
Saqib Ansari
2b354270eb
Merge pull request #30875 from deepeshgarg007/supply_type_einvoice 
fix(India): Supply type for overseas invoices with payment of tax
 2022-05-02 21:49:52 +05:30
Saqib Ansari
c8aa77285e fix: supply type for sez invoices with payment of tax 2022-05-02 21:15:54 +05:30
Deepesh Garg
d7cb269e0c fix: Supply type for overseas invoices with payment of tax 2022-05-02 19:23:43 +05:30
Ahmad
04c96b547e feat: request_for_quotation - refactor 
- Set supplier as link in while selecting supplier to create quotation
 2022-05-02 18:05:21 +05:00
Deepesh Garg
f8db6f0ac5
Merge pull request #30872 from frappe/mergify/bp/develop/pr-30852 
fix: Vat Audit report fixes (backport #30852)
 2022-05-02 17:59:10 +05:30
Deepesh Garg
e0fd980bcc
Merge pull request #30848 from deepeshgarg007/cost_center_filter_p_r 
fix: Cost center filter in payment reconciliation
 2022-05-02 17:58:45 +05:30
Deepesh Garg
a31f577c9e fix: Vat Audit report fixes 
(cherry picked from commit d5319a48269a4277818486e7ed74468e9107b8f4)
 2022-05-02 10:44:37 +00:00
Deepesh Garg
b440dabe12 test: Add test for payment reconciliation 2022-05-02 16:09:48 +05:30
Ankush Menat
59a5090843
fix(UX): misleading stock entry lables (#30870) 
* fix(UX): misleading stock entry lables

* chore: field labels

[skip ci]

Co-authored-by: Marica <maricadsouza221197@gmail.com>

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-05-02 15:11:14 +05:30
Rushabh Mehta
548afba8bb
fix(minor): update frappe.error_log to new API (#30864) 
* fix(minor): update frappe.error_log to new API

* refactor: changes for updated log_error api

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-05-02 15:04:26 +05:30
Ankush Menat
dcda55641b
fix: convert default_item_manufacturer to link field (#30835) 2022-05-02 13:58:22 +05:30
Ankush Menat
f0049da284
chore: correct link 2022-05-02 11:52:46 +05:30
Ankush Menat
bae8ab2fa9
Merge branch 'develop' into education_sepration 2022-05-02 11:47:37 +05:30
sersaber
b8a9f821a4
feat: Copy task color from project template (#30857) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-05-02 10:29:43 +05:30
Rushabh Mehta
be0f84a722 fix(minor): fix create_accounting_dimensions_in_orders.py 2022-05-02 09:41:12 +05:30
Deepesh Garg
fc09c90af7
Merge branch 'develop' into accounting_dimension_consistency 2022-05-01 22:02:10 +05:30
Rushabh Mehta
d746db5547 fix(minor): discount accounting patch 2022-05-01 12:25:21 +05:30
Vlad
5eddaddf74 fix: update translate 2022-04-30 21:47:34 +03:00
Deepesh Garg
19d66e5219 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_consistency 2022-04-30 22:15:27 +05:30
Deepesh Garg
c7edc29152 Merge branch 'develop' of https://github.com/frappe/erpnext into cost_center_filter_p_r 2022-04-30 22:11:43 +05:30
Deepesh Garg
bfd053ed23
Merge branch 'develop' into uae_setup_cleaup 2022-04-30 19:54:40 +05:30
Devin Slauenwhite
5ff471e22f fix: linter 2022-04-29 16:39:33 -04:00
Devin Slauenwhite
fa1378dd49 fix: prevent user from proceeding without all qty picked. 2022-04-29 16:38:52 -04:00
Devin Slauenwhite
5f8f83c6d8 fix: warn user pick list is not complete instead of auto fulfilling picked_qty. 2022-04-29 16:28:49 -04:00
Devin Slauenwhite
48128911be fix: syntax 2022-04-29 16:27:15 -04:00
Devin Slauenwhite
472e634625
Merge branch 'develop' into feat-picklist-scan 2022-04-29 14:11:42 -04:00
Devin Slauenwhite
2554cdceeb revert: scan_mode flag 2022-04-29 13:45:59 -04:00
Devin Slauenwhite
24d8f62b21 revert: barcode scan field from pick list item. 2022-04-29 13:40:48 -04:00
Deepesh Garg
ab94b73e93 fix: Cost center filter on payment reconciliation 2022-04-29 18:06:13 +05:30
Rucha Mahabal
65742947e7
fix(UX): record reason for skipping attendance or marking absent for auto attendance (#30844) 2022-04-29 15:46:00 +05:30
Deepesh Garg
a8452c2ba2 fix: Multi currency opening invoices 2022-04-29 14:27:03 +05:30
Deepesh Garg
1622faad40
Merge pull request #30802 from deepeshgarg007/multi_currency_opening 
fix: Allow multi-currency opening invoices
 2022-04-29 13:34:54 +05:30
Deepesh Garg
f25251bb70 chore: Clean up patches 2022-04-29 12:42:29 +05:30
Deepesh Garg
0cb36cc18c
Merge branch 'develop' into payment_term_rpt_on_selling 2022-04-28 21:22:38 +05:30
Deepesh Garg
3c578a3b0b chore: Add patch to delete education doctypes 2022-04-28 19:54:28 +05:30
Deepesh Garg
44c54f69f8 chore: Remove references for Student doctype 2022-04-28 16:16:47 +05:30
Deepesh Garg
cc867fd949 chore: Remove Fees Doctype 2022-04-28 15:51:32 +05:30
Deepesh Garg
848827cf5c chore: Remove references for Assessment Group 2022-04-28 15:11:22 +05:30
Deepesh Garg
8dcbbf1b9e chore: Remove course links from training doctypes 2022-04-28 13:49:34 +05:30
Deepesh Garg
60b693f84f chore: clean up hooks 2022-04-28 12:02:54 +05:30
Deepesh Garg
41e2959389 chore: remove files related to LMS 2022-04-28 10:41:30 +05:30
Devin Slauenwhite
8053f2dbcd feat: increment picked_qty on scan_barcode 2022-04-27 22:10:15 -04:00
Devin Slauenwhite
ceffbf243e fix: show alert when maximum qty scanned is reached 2022-04-27 22:07:25 -04:00
Devin Slauenwhite
159cf2848e fix: get correct row to modify with duplicate item_codes and max_qty fields are present 2022-04-27 22:03:39 -04:00
Devin Slauenwhite
e04fbb6a99 feat: pick list scan fields 2022-04-27 22:02:04 -04:00
Deepesh Garg
69d369dd7f refactor: Remove education domain from ERPNext 2022-04-27 19:20:36 +05:30
Ankush Menat
777f0204dd
test: create new item instead of using with _Test Item (#30827) 
Unnecessary dependency causes flake in stock. The test was reposting all
entries for item just to test some behavior that is best tested on a
newly created item _anyway_.
 2022-04-27 17:47:40 +05:30
Ankush Menat
ebd5f0b1bb chore: make picked qty read only 2022-04-27 14:53:20 +05:30
Ankush Menat
9a8e3ef235 fix(UX): only show pick list when picking is pending 
[skip ci]
 2022-04-27 14:43:42 +05:30
Ankush Menat
47e1a0104c fix: dont map picked qty and consider pick qty for new PL 
Co-Authored-By: marination <maricadsouza221197@gmail.com>
 2022-04-27 13:44:19 +05:30
Deepesh Garg
429361ce87 chore: Remove domains from Setup 2022-04-27 13:32:51 +05:30
Ankush Menat
8207697e43 fix: compare against stock qty while validating 
Other changes:

- only allow whole number of bundles to get picked
 2022-04-27 12:51:18 +05:30
Ahmad
b226e7d2ac feat: request_for_quotation 
- Show supplier name if supplier ID is not equal to supplier name
 2022-04-27 12:16:03 +05:00
Ankush Menat
9e60acdf56 test: test bundle - picklist behaviour 2022-04-27 12:05:15 +05:30
Ankush Menat
ee54ece8fd test: product bundle fixture 2022-04-27 12:05:15 +05:30
Ankush Menat
1ac275ce61 feat: transfer picklist stock info to packing list 2022-04-27 12:05:15 +05:30
Ankush Menat
41aa4b3524 fix: round off bundle qty 
This is to accomodate bundles that might allow floating point qty.
 2022-04-27 12:05:15 +05:30
Ankush Menat
25485edfd9 refactor: remove unnecssary vars 
also remove misleading docstring
 2022-04-27 12:05:15 +05:30
Ankush Menat
23cb0d684d feat: create DN from pick list with bundle items 2022-04-27 12:05:15 +05:30
Ankush Menat
f574121741 refactor: simpler check for non-SO items 2022-04-27 12:05:15 +05:30
Ankush Menat
277b51b404 refactor: groupby using keys instead of int index 2022-04-27 12:05:15 +05:30
Ankush Menat
3ddad6891a refactor: simplify needlessly complicated code 2022-04-27 12:05:15 +05:30
Ankush Menat
60bc26fdbe feat: back-update min picked qty for a bundle 2022-04-27 12:05:15 +05:30
Ankush Menat
c3fc0a4f55 perf: single update per Sales Order. 
For each SO item the sales order picking status was being updated, this
isn't required and wasteful.
 2022-04-27 12:05:15 +05:30
Ankush Menat
e64cc66df7 refactor: sales order status update 
- rename badly named variables
- support updated packed items
 2022-04-27 12:05:15 +05:30
Ankush Menat
36c5e8a14f feat: Pick list from SO with Product Bundle 2022-04-27 12:05:15 +05:30
Ankush Menat
7d5682020a test: bundles in picklist 2022-04-27 12:05:15 +05:30
Ankush Menat
5c3f9019cc refactor: misc pick list refactors 
- make tracking fields read only and no-copy 🤦
- collapse print settings section, most users configure it once and
  forget about it, not need to show this.
- call pick list grouping function directly
- use get_descendants_of instead of obscure db function
 2022-04-27 12:05:15 +05:30
Deepesh Garg
67bb29026f fix: Ignore custom field validation while setup 2022-04-26 20:15:15 +05:30
Ankush Menat
24a7acaabc chore: incorrect translations 2022-04-26 19:22:26 +05:30
Ankush Menat
dcc2243fbb
Merge pull request #30811 from marination/multiple-wh-acc 
chore: Warn users about multiple warehouse accounts
 2022-04-26 18:18:11 +05:30
marination
e2a163d4e9 fix: Use account_type == 'Stock' to filter stock accounts 2022-04-26 17:50:51 +05:30
marination
44331f4f1f chore: Warn users about multiple warehouse accounts 
- Get distinct accounts that warehouse value has been booked against
- If same account as the one being set, ignore
- If not same account or multiple accounts: warn user that it makes it harder to track mismatches
 2022-04-26 17:43:33 +05:30
Rucha Mahabal
1cc8c79807
test: fix flaky carry forwarded leave expiry test (#30810) 2022-04-26 17:43:08 +05:30
Saqib Ansari
078f26bef3
Merge pull request #30808 from nextchamp-saqib/pos-search-ux-fix 
fix(pos): search field doesn't reset on checkout
 2022-04-26 14:47:22 +05:30
Saqib Ansari
b1ac5ff9d2 fix(pos): number pad translations 2022-04-26 14:41:36 +05:30
Saqib Ansari
03a6103fe5 fix(pos): search field doesn't reset on checkout 2022-04-26 14:28:33 +05:30
Deepesh Garg
00ace8f62c
Merge branch 'develop' into accounting_dimension_consistency 2022-04-26 14:26:08 +05:30
Deepesh Garg
82a0635c66 fix: Consistent accounting dimensions across Sales and Purchase docs 2022-04-26 14:01:13 +05:30
ruthra kumar
b0ead459a0 feat: add payment terms status rpr to Selling homepage 2022-04-26 13:30:13 +05:30
Ankush Menat
88e257ff6d fix: column name in party query 2022-04-26 11:47:05 +05:30
Ankush Menat
052171f51c fix: date condition in tax rule 2022-04-26 11:47:05 +05:30
Ankush Menat
a90e7e32a4 fix: proper quoting in sql queries 2022-04-26 11:47:05 +05:30
Ankush Menat
7e555d3d8c fix: item price query for postgres 
postgres doesn't like bad type comparisons and doesn't have `isnull`
funciton
 2022-04-26 11:47:02 +05:30
Ankush Menat
7d2587c0a9 fix: nullish check and table name 2022-04-26 11:03:32 +05:30
Ankush Menat
0fdfc1e76e fix: only query fields that exist 2022-04-26 11:03:32 +05:30
Ankush Menat
ce75fe0ec4 fix: out of range date value 2022-04-26 11:03:32 +05:30
Ankush Menat
cdac2b8c63 fix: ignore duplicate fixtures 2022-04-26 11:03:32 +05:30
Ankush Menat
e1c1687661 refactor: use db agnostic CombineDatetime 2022-04-26 11:03:32 +05:30
Deepesh Garg
d3582ea399 fix: Allow multi-currency opening invoices 2022-04-25 18:18:39 +05:30
Deepesh Garg
4ffea617ef
Merge pull request #30754 from deepeshgarg007/round_off_account_cost_center 
fix: First preference to parent cost center rather than round off cost center
 2022-04-25 17:06:19 +05:30
Deepesh Garg
3fa1c63479 test: Unit test for round off entry dimensions 2022-04-25 16:29:26 +05:30
Deepesh Garg
b1158bcb7c
Merge pull request #30799 from nextchamp-saqib/einv-cess-fix 
fix(india): cess value not considered while validating e-invoice totals
 2022-04-25 14:39:15 +05:30
Deepesh Garg
f064e0b15e
Merge pull request #30642 from rahib-hassan/separate-discount-account 
feat: separate discount accounting for buying and selling
 2022-04-25 14:07:20 +05:30
Saqib Ansari
8e6c7a6bf7 fix(india): cess value not considered while validating e-invoice totals 2022-04-25 14:02:46 +05:30
Deepesh Garg
02aaa6546c chore: Remove dead code 2022-04-25 12:42:06 +05:30
Deepesh Garg
22bc107d70
Merge pull request #30778 from deepeshgarg007/accpunting_dimension_validate_ignore_new 
fix: Do not validate while creating accounting dimension
 2022-04-25 12:30:51 +05:30
rahib-hassan
6c86067d90
Merge branch 'develop' into separate-discount-account 2022-04-25 12:17:50 +05:30
Ankush Menat
d6a43a39ae
test: tie breaking in SLEs (#30796) 
[skip ci]
 2022-04-25 11:46:01 +05:30
Deepesh Garg
618fa0e8ea
Merge branch 'develop' into accpunting_dimension_validate_ignore_new 2022-04-24 20:55:50 +05:30
Deepesh Garg
afc6aa88f0
Merge pull request #30763 from deepeshgarg007/loan_reconciliation 
fix: Add loan doctypes in bank clearance
 2022-04-24 20:55:29 +05:30
Deepesh Garg
c515abc392 test: Remove teardown method 2022-04-24 19:20:29 +05:30
Deepesh Garg
c312cd3725 fix: Check if accounting dimension exists 2022-04-24 18:11:32 +05:30
Deepesh Garg
783793deac Merge branch 'develop' of https://github.com/frappe/erpnext into round_off_account_cost_center 2022-04-23 21:40:38 +05:30
Deepesh Garg
015812b0b8 fix: Add accounting dimensions for round off GL Entry 2022-04-23 21:40:08 +05:30
Deepesh Garg
d4d83f4bb6 test: Fixes in test case 2022-04-23 12:33:35 +05:30
Deepesh Garg
0eacc99ab7 test: Fixes in test case 2022-04-23 12:08:30 +05:30
Rucha Mahabal
deed9702cf
Merge pull request #30780 from ruchamahabal/promotion-enhancements 2022-04-22 22:33:39 +05:30
Rucha Mahabal
8e5327a0e0 fix: clear property child table on changing employee 2022-04-22 21:33:24 +05:30
Rucha Mahabal
9d158088ee chore: remove unused Employee Transfer Property doctype 2022-04-22 20:20:12 +05:30
Rucha Mahabal
cfa4dfe7a8 fix: reset old CTC on promotion cancellation 2022-04-22 20:20:04 +05:30
Rucha Mahabal
9b93c63830 fix: tests 2022-04-22 17:54:32 +05:30
Wolfram Schmidt
43c1d63ab2
fix translation (#30781) 
fixed the short word for March in german language
 2022-04-22 17:32:34 +05:30
Rucha Mahabal
788e0a1c6c chore: format employee_property_update.js 2022-04-22 17:25:37 +05:30
Rucha Mahabal
ed04241cf4
Merge branch 'develop' into promotion-enhancements 2022-04-22 16:38:01 +05:30
Rucha Mahabal
833a33a94b test: employee property update via Employee Promotion 2022-04-22 16:28:25 +05:30
Rucha Mahabal
a93867de19 feat: add CTC fields in Employee master and Promotion 2022-04-22 16:28:14 +05:30
marination
8d632e9b9c style: Re-run pre-commit 2022-04-22 16:27:29 +05:30
marination
b848e61954 fix: Skip unpublished Variants with published templates in shopping cart quote validation 2022-04-22 16:25:56 +05:30
Devin Slauenwhite
53d8168dea fix: linter format string after translation 2022-04-22 16:25:28 +05:30
Devin Slauenwhite
ea6d6e31b3 fix: linter trilaing whitespace 2022-04-22 16:25:21 +05:30
Devin Slauenwhite
48da3b4482 fix: sider issues 2022-04-22 16:23:18 +05:30
Devin Slauenwhite
b88d5d135e fix(test): validate exception without website item 2022-04-22 16:23:07 +05:30
Devin Slauenwhite
86832fb7fe test: assert error if quotation contains non website item 2022-04-22 16:22:58 +05:30
Devin Slauenwhite
678a1179d4 fix: shopping cart quotation without website item 2022-04-22 16:22:32 +05:30
Deepesh Garg
9bb132fdd3 fix: Do not validate while creating accounting dimension 2022-04-22 13:39:43 +05:30
Vladislav
e088e65871
fix: update translation (#30725) 
* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv
 2022-04-22 11:00:57 +05:30
Deepesh Garg
81b3342480
Merge pull request #30757 from nextchamp-saqib/einv-401-fix 
fix(india): 401 & 403 client error while generating IRN
 2022-04-21 18:55:26 +05:30
Deepesh Garg
8a8476bb5c test: Add test coverage for bank clearance 2022-04-21 18:53:18 +05:30
Ankush Menat
d5ab626a31
Merge pull request #30726 from ankush/dependent_gle_reposting 
fix: dependent gle reposting
 2022-04-21 18:06:40 +05:30
Ankush Menat
ee3036651a
fix: batch_no filtering not working when batch no is also a number in scientific notation (#30770) 
[skip ci]
 2022-04-21 16:34:31 +05:30
rahib-hassan
78c8e46511
Merge branch 'develop' into separate-discount-account 2022-04-21 15:06:58 +05:30
Deepesh Garg
c42547d40f fix: Use parent cost center for Sales and Purchase Invoice 2022-04-21 13:26:44 +05:30
Marica
87f1617780
Merge branch 'develop' into field-filters-e-com 2022-04-21 12:32:33 +05:30
marination
c5d4bed932 test: setup e commerce settings before running invalid filtrs test 2022-04-21 12:29:30 +05:30
Rucha Mahabal
c3dc5d5ce7 fix: property addition not working for select fields 2022-04-21 08:17:00 +05:30
rahib-hassan
02e17dbded fix: removed manual enable-discount-account method 2022-04-21 02:42:42 +05:30
rahib-hassan
2c78cc2014 fix: removed manual rollback - enable discount account 2022-04-21 02:40:59 +05:30
Deepesh Garg
3d0e68acaa fix: select doctype as payment_document 2022-04-20 19:49:53 +05:30
Deepesh Garg
c3e27b5556 fix: Loan doctypes in bank reconciliation 2022-04-20 19:07:53 +05:30
marination
8981405a62 test: Field filter validation and Custom field as field filter 
- Test to block Item fields (which aren’t in Website Item) in E Commerce Settings as filters
- Removed unnecessary function and setup in E Commerce Settings test
- Removed commented useless test
- Test to check custom field as filter
 2022-04-20 18:50:47 +05:30
marination
6d750e185e fix: Handle Multiselect field mapping separately 
- Map Multiselect child table to Website Item (copy rows)
 2022-04-20 17:40:03 +05:30
rahib-hassan
13092bcc2d fix: enable discount roll_back 2022-04-20 16:46:29 +05:30
rahib-hassan
1e143e7479 fix: use @change_settings to enable_discount_account 2022-04-20 16:06:55 +05:30
rahib-hassan
f3fa6ac4c2 fix: account setting seperation gl discount account creation 2022-04-20 16:01:12 +05:30
Rucha Mahabal
5411e69553
fix: filters not working in Shift Assignment Calendar view (#30752) 2022-04-20 14:56:06 +05:30
Saqib Ansari
ee8047aba3 fix(india): 401 & 403 client error while generating IRN 2022-04-20 14:14:29 +05:30
rahib-hassan
f058755ad3 fix: test cases updated 2022-04-20 13:24:15 +05:30
HENRY Florian
143786aaa0
fix: Must not be able to start Job Card if it is related to Work Order that is not started yet (#29072) 
* fix: Cannot start Job strat if related to Work Order not started yet

* fix: Cannot start Job strat if related to Work Order not started yet

* test

* test

* fix siders

* PR review

* chore: Code cleanup

- Better short circuit for if condition (make it such that both conditions dont always have to be computed)
- Remove `r.message` extraction by avoiding `then()`

* chore: Remove unnecessary json change

Co-authored-by: marination <maricadsouza221197@gmail.com>
 2022-04-20 12:29:52 +05:30
marination
5660b335ba fix: Mistyped variable name in patch 2022-04-20 12:25:59 +05:30
Deepesh Garg
0ac11a5b30 fix: First preference to parent cost center rather than round off cost center 2022-04-20 12:18:11 +05:30
Ankush Menat
9734329094 test: discard local future SLE cache between tests 2022-04-19 17:40:28 +05:30
Ankush Menat
700e864d90 fix: sort stock vouchers before reposting GLE 2022-04-19 17:40:26 +05:30
Ankush Menat
b24920c0e9 fix: correct sorting while updating bin 2022-04-19 17:38:36 +05:30
Ankush Menat
d2882ea436 test: use disposable item codes in tests 
dependency causes flake
 2022-04-19 17:38:36 +05:30
Ankush Menat
8f519545b0 test: repost queue progress 2022-04-19 17:38:36 +05:30
Ankush Menat
ecdb49314f fix: dependent GLE reposting 2022-04-19 17:38:36 +05:30
Ankush Menat
a2af2daca7 test: dependent GL entry reposting 2022-04-19 17:38:36 +05:30
Ankush Menat
afc5a55a23 refactor: repost error handling 2022-04-19 17:38:36 +05:30
FinByz Tech Pvt. Ltd
54a05075f3 fix(india): transporter name is null while generating e-way bill (#30736) 
(cherry picked from commit 6291b28c37f02380001ab68b3a660b2804383ab2)
 2022-04-19 10:57:59 +00:00
Rucha Mahabal
789fa31b82
Merge branch 'develop' into shift-type-null-in-employee-checkin 2022-04-19 13:39:32 +05:30
Rucha Mahabal
3cddc1e97e test: shift fetching when assignment has an end date 2022-04-19 13:39:03 +05:30
Rucha Mahabal
98cccf221e fix: shift fetching fails in Employee Checkin if shift assignment has an end date 
Co-authored-by: Ejaaz Khan <ejaazrkhan@gmail.com>
 2022-04-19 13:17:36 +05:30
Rucha Mahabal
7c547f152f
fix(patch): check if column is present while fixing reverse linking (#30737) 2022-04-19 12:18:46 +05:30
marination
d0cd194398 chore: Patch to copy custom fields (field filters) from Item to Website Item 2022-04-18 21:40:19 +05:30
Deepesh Garg
d96bfe13a8 Merge pull request #30721 from ruthra-kumar/bug_so_analysis_report 
fix: SO's without delivery note will also be fetched
 2022-04-18 19:58:37 +05:30
marination
1e80b97915 refactor: Change Filter Fields table fieldtype to Autocomplete 
- Remove dynamic js fieldtype change to `Select`
 2022-04-18 19:01:43 +05:30
marination
d35b37881b fix: Validate field filter wrt to Website Item & re-use validation in Item Group 2022-04-18 18:51:48 +05:30
Marica
8a366309e1
Merge branch 'develop' into field-filters-e-com 2022-04-18 18:11:25 +05:30
marination
c993ac09df fix: Query filter fields from Website Item instead of Item master 
- tweak `filters.py` to correctly query filter field values from Website Item
- Use Website Item for filter field options in Settings and Item Group Field Filter table
 2022-04-18 18:01:48 +05:30
rahib-hassan
bcfbb3e9c8 fix: code formatting 2022-04-18 15:04:47 +05:30
rahib-hassan
ebb7bc201b fix: library import formatting 2022-04-18 14:53:45 +05:30
Deepesh Garg
264ec65255
Merge pull request #30728 from deepeshgarg007/pricing_rule_apply_mapped_doc 
fix: Price changing on creating Sales return from Delivery Note
 2022-04-18 14:34:28 +05:30
rahib-hassan
52fd804aed Merge branch 'develop' of github.com:rahib-hassan/erpnext into separate-discount-account 2022-04-18 14:13:46 +05:30
Deepesh Garg
9c081947ec fix: Price changing on creating Sales retrun from Delivery Note 2022-04-18 10:21:15 +05:30
Deepesh Garg
5cdd0d6719 fix: Move tax withholding category field 2022-04-16 20:34:56 +05:30
Deepesh Garg
0a67b0239e fix: Consistent customer and supplier forms 2022-04-16 19:43:59 +05:30
ruthra kumar
13487e2408 test: Sales order analysis report 2022-04-16 12:02:32 +05:30
Bhavesh Maheshwari
72757994f8 fix: process statement to_date override 
(cherry picked from commit 378d15d388ae9cac7a5f897af83c99605403503a)
 2022-04-14 13:14:11 +00:00
ruthra kumar
e28e6726f1 fix: SO analysis rpt will fetch SO's without Delivery note as well 2022-04-14 18:37:46 +05:30
Ankush Menat
9af2d68945 refactor: convert queries to ORM/QB, add types 2022-04-14 18:05:38 +05:30
Ankush Menat
ba29323e11 test: increase assertions to cover all cases 2022-04-14 18:05:38 +05:30
Ankush Menat
e278ee359a test: item attribute columns 2022-04-14 18:05:38 +05:30
Ankush Menat
febc74a21b refactor: rewrite stock balance query to QB 2022-04-14 18:05:35 +05:30
Ankush Menat
8a499e95d3 test: uom conversion in stock balance report 2022-04-14 18:01:43 +05:30
Ankush Menat
af0ea7b532 test: assert balanaces against SLE 2022-04-14 18:01:42 +05:30
Ankush Menat
f4766ae4eb test: opening balance in stock balance report 2022-04-14 18:01:42 +05:30
Ankush Menat
8b2432dfa0 test: stock balance report tests 2022-04-14 18:01:42 +05:30
Ankush Menat
64ac22af82 refactor: add filter type info 2022-04-14 18:01:42 +05:30
HENRY Florian
e6aa28ea14
fix: update translation (#30716) 
* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation
 2022-04-14 17:46:47 +05:30
Ankush Menat
15576c1ce8
Merge pull request #30707 from marination/values-out-of-sync-jv 
fix: Remove "Values Out of Sync" validation
 2022-04-14 17:39:18 +05:30
Ankush Menat
0d64349142
Merge branch 'develop' into separate-discount-account 2022-04-14 17:29:28 +05:30
rahib-hassan
4130493b58 fix: Label typo 2022-04-14 16:03:08 +05:30
rahib-hassan
01fde15bd5 fix: dependent codes updated 2022-04-14 15:48:55 +05:30
rahib-hassan
0eff74c650 fix: tabspacing 2022-04-14 15:42:16 +05:30
Deepesh Garg
1659f1eb6d
Merge pull request #29963 from nabinhait/income-tax-computation 
feat: Income tax computation Report
 2022-04-14 15:31:17 +05:30
Deepesh Garg
e2fa9f708e
Merge pull request #30710 from deepeshgarg007/advance_jv_allocation 
fix: Exchange gain and loss on advance Journal Entry allocation
 2022-04-14 15:10:04 +05:30
Nabin Hait
cd2ab32242 fix: orginised code 2022-04-14 14:05:21 +05:30
Nabin Hait
bc7007d588
fix: get enabled deduction components 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2022-04-14 14:02:01 +05:30
Nabin Hait
d06b7378f8
fix: get enabled and submitted income tax slab 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2022-04-14 14:01:44 +05:30
Nabin Hait
67086e618d
fix: get enabled earning components 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2022-04-14 14:00:28 +05:30
Marica
87117313a1
Merge branch 'develop' into values-out-of-sync-jv 2022-04-14 13:41:27 +05:30
Deepesh Garg
c38be53ce8 test: Update customer in Sales Invoice 2022-04-14 13:26:47 +05:30
Suraj Shetty
11fa187263
Merge pull request #30715 from surajshetty3416/fix-exotel-call-log 2022-04-14 12:45:15 +05:30
Suraj Shetty
77599fe443 fix: Set correct options for link field 
issue introduced via https://github.com/frappe/erpnext/pull/30711
 2022-04-14 12:32:31 +05:30
Deepesh Garg
86cfa3a53f
Merge pull request #30712 from frappe/mergify/bp/develop/pr-30700 
fix: Payment reco query with max invoice and payment amount limit (backport #30700)
 2022-04-14 12:32:11 +05:30
marination
d75d5ebe8d chore: Remove Values Out of Sync from Repost hourly job 
- It runs after repost (after commiting), so it has 0 impact on repost itself
- Just that scheduled job log shows up as failed, while actually repost is done and repost document is "Completed"
- The check is inaccurate also, so best to remove this
- Users cant do anything about it anyway. This just piles up phantom failed jobs unneccessarily
 2022-04-14 12:30:06 +05:30
Deepesh Garg
065c38152a Merge branch 'develop' of https://github.com/frappe/erpnext into item_wise_provisional_accounting 2022-04-14 12:04:21 +05:30
Deepesh Garg
ad171c6225 test: Update test case 2022-04-14 12:03:12 +05:30
Deepesh Garg
e6cb948a96 fix: Payment reco query with max invocie and payment amount limit 
(cherry picked from commit 4008c95ac6afc3b06a0a602e3f469db61e1f0453)
 2022-04-14 05:42:17 +00:00
Deepesh Garg
972d9ec5b4 test: Update customer 2022-04-14 11:10:41 +05:30
Suraj Shetty
6e837bcdfc style: Fix linter warning 2022-04-14 10:02:15 +05:30
Suraj Shetty
c272170b86 fix(call log): Convert Data to Link for type_of_call 
Convert `Data` to `Link` for type_of_call,
employee_user_id and call_received_by fields
 2022-04-14 09:51:54 +05:30
Deepesh Garg
31883b699d fix: Exchange gain and loss on advance jv allocation 2022-04-13 20:52:25 +05:30
Ankush Menat
79fbc2c504
test: flaky PR close test (#30709) 2022-04-13 20:42:25 +05:30
Suraj Shetty
d890ee9495
Merge pull request #29962 from nemesis189/exotel-fixes 
fix: Exotel Call Log fixes
 2022-04-13 20:36:03 +05:30
Suraj Shetty
ff41b8da4e fix: Update received_by if "to" is changed 2022-04-13 20:12:08 +05:30
Suraj Shetty
cef28df8db test: Do not overwrite frappe.form_dict to retain proxy reference 
Set frappe.local.form_dict instead
 2022-04-13 19:10:19 +05:30
marination
89fab78027 fix: Remove "Values Out of Sync" validation from Journal Entry 
- Even if there is a difference there's not much a user can do
- Checking it at the JV level is senseless. Blindly making users post another JV will lead to more error.
- Users making JV are usually accountants who know what they are doing
- The validation computes incorrect values for an account that contributes partially to warehouse's value.
 2022-04-13 18:44:50 +05:30
Raffael Meyer
6453fb4cea
refactor!: remove DATEV integration (#30584) 
The DATEV integration follows the trend and moves into a separate app.

- the DATEV Integration will be maintained at https://github.com/alyf-de/erpnext_datev (version-14 branch)
- the German Compliance and Localization will be maintained at https://github.com/alyf-de/erpnext_germany
 2022-04-13 09:24:19 +00:00
Marica
c5247a0767
Merge branch 'develop' into pp-wo-company 2022-04-13 11:52:15 +05:30
marination
6315acc450 fix: Map correct company to PO made via Prod Plan (subcontract) 2022-04-13 11:47:58 +05:30
Ankush Menat
bfaaebde0d
Merge branch 'develop' into separate-discount-account 2022-04-12 18:38:23 +05:30
Deepesh Garg
228195ba74
Merge pull request #30689 from deepeshgarg007/disabled_gl_dimensions 
fix: Do not show disabled dimensions in reports
 2022-04-12 16:11:07 +05:30
Deepesh Garg
4f9b38a591
Merge pull request #30686 from nabinhait/ignore-permlevel-for-fields 
feat: Ignore permlevel for specific fields
 2022-04-12 15:55:28 +05:30
Noah Jacob
8261b2bb4f
refactor: trigger generate schedule when any change made in items table (#29874) 
* refactor: trigger generate schedule when any change made in items table

* chore: added serial validation on server side

* test: serials updated in schedules after save

* fix: schedule not generating after updating some fields

* feat: generate_schedule is triggered on_save when items table is changed

* test: updated tests to check other field changes on save

* chore: removed serial validation function for schedules table and added no_of_visits validation function

* test: updated for manually deleted schedele rows

* refactor: updated validate_items_table_change to return bool

* test: updated test_schedule_with_serials to cover validate_items_table_change

* fix: linting
 2022-04-12 15:30:49 +05:30
Deepesh Garg
9a1c560c82 fix: Do not show disabled dimensions in reports 2022-04-12 15:27:08 +05:30
marination
2777c5c67c fix: Map Production Plan company in subassembly WO created from it 2022-04-12 14:30:01 +05:30
Nabin Hait
993c6c0de9 feat: Ignore permlevel for specific fields 2022-04-12 12:24:47 +05:30
Ankush Menat
60fb71bd2a
fix: ignore item-less maintenance visit for sr no (#30684) 2022-04-12 11:14:02 +05:30
Deepesh Garg
7d263e9ecf
Merge pull request #30651 from deepeshgarg007/gst_download_json_key_error 
fix: Download JSON for GSTR-1 report
 2022-04-12 00:06:25 +05:30
Marica
014298a867
Merge pull request #30674 from marination/work-order-partial-transfer 
fix: Handle multiple item transfer in separate SEs against WO
 2022-04-11 17:23:57 +05:30
Deepesh Garg
79b90118e1
Merge branch 'develop' into gst_download_json_key_error 2022-04-11 17:15:04 +05:30
Marica
3f8be3ac10
Merge branch 'develop' into work-order-partial-transfer 2022-04-11 16:49:22 +05:30
marination
5aa60bb651 test: Multiple RM transfer in separate Stock Entries 
- Added test and acceptance of 0 as For Quantity in test helper
 2022-04-11 16:44:55 +05:30
Nabin Hait
e46898f5f5 fix: test cases 2022-04-11 16:37:34 +05:30
Nabin Hait
aad29ad572 fix: removed unused imports 2022-04-11 15:33:22 +05:30
marination
be2e5ce966 style: Missing Semicolon 2022-04-11 15:32:57 +05:30
Nabin Hait
c27e3ef03e fix: Show message is no employee found 2022-04-11 15:30:26 +05:30
Deepesh Garg
553178bfe7 test: Add test 2022-04-11 15:29:20 +05:30
Nabin Hait
7072dda31f fix: sider issues 2022-04-11 15:19:42 +05:30
Deepesh Garg
54eef3daad Merge branch 'develop' of https://github.com/frappe/erpnext into deferred_revenue_default_account_fixes 2022-04-11 15:09:30 +05:30
Saqib Ansari
0373347a97
Merge branch 'develop' into separate-discount-account 2022-04-11 14:55:42 +05:30
Nabin Hait
c7848089ab tests: Added unit tests for income tax computation report 2022-04-11 14:51:23 +05:30
Deepesh Garg
3ce64170db feat: Item-wise provisional accounting for service items 2022-04-11 14:35:22 +05:30
rahib-hassan
a7a5742375 fix: merge conflict(patch) 2022-04-11 14:28:36 +05:30
marination
dfff4beaf4 fix: Handle multiple item transfer in separate SEs against WO 
- Check for pending qty in child items to show/hide "Start" button
- If no qty needed to transfer (FG qty is fulfilled), but RM qty pending: map pending in SE with For Quantity = 0
 2022-04-11 14:10:57 +05:30
Ankush Menat
c3e1f0e369 refactor: ignore mandatory fields during setup 2022-04-11 13:19:17 +05:30
Ankush Menat
086d31b59f fix: dont validate currency exchange in setup 
Redues ~4-5 seconds of time and chances of setup failure.
 2022-04-11 13:19:17 +05:30
Nabin Hait
e3a53590de fix: Added filter to consider Tax Exemption Declaration if proof not submitted 2022-04-11 12:23:13 +05:30
Nabin Hait
535217a042 fix: Added income tax slab column 2022-04-11 12:23:13 +05:30
Nabin Hait
1f018a912b fix: Get exemptions from declaration only if proof not submitted 2022-04-11 12:23:13 +05:30
Nabin Hait
b4900ef220 fix: duplicate exemption amount and rounded tax 2022-04-11 12:23:13 +05:30
Nabin Hait
a74eec01ea fix: Added report link in the Payroll workspace 2022-04-11 12:23:13 +05:30
Nabin Hait
a9b5d990a4 fix: Removed designation filter 2022-04-11 12:23:13 +05:30
Nabin Hait
0480bb318e fix: Modified column width 2022-04-11 12:23:13 +05:30
Nabin Hait
f9633bbd48 feat: Income Tax Computation Report 2022-04-11 12:23:11 +05:30
HENRY Florian
03c631d723
fix: update translation (#30654) 2022-04-11 10:49:18 +05:30
Deepesh Garg
227a711d70
Merge pull request #30585 from frappe/mergify/bp/develop/pr-30575 
fix: Do not apply shipping rule for POS transactions (backport #30575)
 2022-04-10 20:12:53 +05:30
Deepesh Garg
0f414d51f4
Merge pull request #30443 from frappe/mergify/bp/develop/pr-30438 
fix: Incorrect default amount to pay for POS invoices (backport #30438)
 2022-04-10 18:56:02 +05:30
Deepesh Garg
ddbd82af95
Merge pull request #30459 from frappe/mergify/bp/develop/pr-30385 
fix(India): Auto tax fetching based on GSTIN (backport #30385)
 2022-04-10 18:55:26 +05:30
Deepesh Garg
809117229d
Merge pull request #30626 from nextchamp-saqib/einv-utgst 
feat(india): e-invoicing for intra-state union territory transactions
 2022-04-10 18:54:17 +05:30
Ankush Menat
8138e53cf3 test: flaky picklist tests 2022-04-10 17:50:57 +05:30
Deepesh Garg
a2937cffc7 fix: Implicit ignore pricing rule check on returns 
(cherry picked from commit 1b25a7fe765d334fce990d43224f8a790ccf8119)
 2022-04-09 14:46:25 +00:00
Deepesh Garg
207bf85c74
Merge pull request #30488 from Havenir/fix-project-list-in-web-view 
fix: web form filters for project
 2022-04-09 20:06:49 +05:30
Deepesh Garg
cbd8998fc1
Merge branch 'develop' into mergify/bp/develop/pr-30438 2022-04-09 20:03:23 +05:30
Deepesh Garg
02c6b898a6
Merge branch 'develop' into mergify/bp/develop/pr-30385 2022-04-09 19:57:59 +05:30
Deepesh Garg
e30cc8422c
fix: Resolve conflicts 2022-04-09 19:53:40 +05:30
Deepesh Garg
2e00678c76
Merge pull request #30542 from deepeshgarg007/disabled_tax_category 
fix: Ignore disabled tax categories
 2022-04-09 19:52:31 +05:30
mergify[bot]
51d77cd85e
fix(pos): cannot change paid amount in pos payments (#30660) 2022-04-09 16:28:10 +05:30
Rucha Mahabal
cf2e6c6c08 fix: remove hardcoded employee fields that can be updated via Promotion 2022-04-09 13:15:37 +05:30
rahib-hassan
dc2944a041 fix[minor]: removed doc assignment 2022-04-09 03:55:25 +05:30
Suraj Shetty
199419db80
Merge branch 'develop' into exotel-fixes 2022-04-08 21:37:08 +05:30
Suraj Shetty
7ff5bc9e3d test: Clean up form_dict 
To avoid failures like
https://github.com/frappe/erpnext/runs/5887687369?check_suite_focus=true#step:12:783
 2022-04-08 21:33:29 +05:30
rahib-hassan
ac16f3b71f fix: lock timeout exceeded 2022-04-08 18:20:41 +05:30
Ankush Menat
af6b07f9b9
fix: block cancellation of SL/GL entries (#30652) 
Individual GL/SLEs aren't supposed to be cancelled by users.
 2022-04-08 18:05:04 +05:30
rahib-hassan
ac7f1cbd87 fix: minor fix 2022-04-08 17:46:49 +05:30
rahib-hassan
2173c8b114 fix(pathces): added to patches.txt 2022-04-08 17:29:08 +05:30
rahib-hassan
35e875c111 fix(patch): enable discount account in buying and selling if exist in accounts settings 2022-04-08 17:27:53 +05:30
Ankush Menat
fcbd25f27a chore: formatting 2022-04-08 17:24:10 +05:30
Deepesh Garg
b532ade383 fix: Download JSON for GSTR-1 report 2022-04-08 17:14:10 +05:30
rahib-hassan
171c60ff37 fix: removed discount account field from account settings 2022-04-08 16:50:56 +05:30
rahib-hassan
786887768e fix: removed discount-accounting code from account settings 2022-04-08 16:50:36 +05:30
Jannat Patel
59ad7e037c
Merge pull request #30596 from pateljannat/remove-courses-template 2022-04-08 16:27:31 +05:30
Ankush Menat
d74181630a test: prevent cancelling RIV of cancelled voucher 2022-04-08 14:57:55 +05:30
Ankush Menat
a281998bcb fix: prevent deleting repost queue for cancelled transactions 2022-04-08 14:57:55 +05:30
Deepesh Garg
617deda2ff
Merge branch 'version-14-beta' into develop 2022-04-08 13:38:27 +05:30
Ankush Menat
49560d20bc
fix: remove bad defaults from BOM operation (#30644) 
[skip ci]
 2022-04-08 11:23:02 +05:30
rahib-hassan
1babc5f367 feat: separated discount accounting settings for sales and purchase 2022-04-08 08:05:10 +05:30
Ankush Menat
8d57c853f3
feat: barcode scanning in quotation (#30637) 2022-04-07 21:40:03 +05:30
Ankush Menat
225deb949b
fix: use empty row when batch is scanned (#30638) 2022-04-07 21:38:18 +05:30
Sam
8fbfba4f2f
chore: class selectors for customizability (#30185) 
* Update project_row.html

Really helpful those fields has own class when styling for mobile or desktop by using Website Settings --> HTML Header, Robots and Redirects

* chore: skewercase
 2022-04-07 19:27:27 +05:30
Rucha Mahabal
7ba66b0320
Merge branch 'develop' into multiple-shifts 2022-04-07 18:07:39 +05:30
Ankush Menat
f1fd4e5c27 test: cant_change validations on item 2022-04-07 17:30:12 +05:30
Ankush Menat
fba68541d6 refactor(Item): linked doc checking 2022-04-07 17:30:12 +05:30
Ankush Menat
2f1e98d1e8 feat: show Stock Reconciliation links on item dashboard 2022-04-07 17:30:12 +05:30
Sagar Vora
3b4754f3f6 fix: define tax_columns below consistency 2022-04-07 17:01:10 +05:30
Sagar Vora
fa4f57f470 fix: dont reassign mutable (list) to a different field 2022-04-07 16:51:27 +05:30
Deepesh Garg
18b1a93c7e
Merge pull request #30606 from deepeshgarg007/exchange_gain_loss_button 
fix: Exchange gain and loss button in Payment Entry
 2022-04-07 16:49:05 +05:30