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

32255 Commits

Author SHA1 Message Date
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
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