Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,697 Commits 3 Branches 0 Tags 1 GiB
80c0d0db21
Commit Graph

31034 Commits

Author SHA1 Message Date
Deepesh Garg
1e34300f69
Merge branch 'develop' into project_in_purchase_invoice 2022-01-15 21:00:14 +05:30
Deepesh Garg
3438e1f0c4
Merge pull request #29175 from rtdany10/patch-14 
fix: seperate custom field creation for KSA
 2022-01-15 20:52:57 +05:30
Dany Robert
2b681f04fd
fix: exclude existing serial numbers while auto creating new #29292 
fix: exclude existing serial numbers while auto creating new
 2022-01-15 20:08:11 +05:30
Deepesh Garg
14e0d00a61
Merge pull request #29115 from deepeshgarg007/deferred_revenue_multi_currency_jv 
fix: Deferred revenue booking for multi currency invoices via JV
 2022-01-15 18:55:41 +05:30
Deepesh Garg
fd922f1617 fix: Remove unwanted test 2022-01-15 18:27:40 +05:30
Deepesh Garg
ae95439c7e
Merge pull request #29208 from deepeshgarg007/nil_exempt_non_gst_gstr_1 
fix(India): NIL Rated, Exempted and non gst invoices in GSTR-1 report
 2022-01-14 19:43:40 +05:30
Saqib Ansari
1d976655f5
refactor: exclude submittable doctype from SLA (#29286) 2022-01-14 18:46:52 +05:30
Saqib Ansari
cc88b31f1f test: remove sla if no active sla found 2022-01-14 18:17:40 +05:30
Saqib Ansari
b31679b6ef fix: customer filter while fetching active sla 2022-01-14 16:31:48 +05:30
Saqib Ansari
0bfbfa3719 fix: reset sla if no active sla found 2022-01-14 16:13:17 +05:30
Saqib Ansari
a68fc546e7 refactor: do not allow submittable doctypes for SLA 2022-01-14 15:35:40 +05:30
Saqib Ansari
203fca45bf
fix: order of company form fields (#29287) 2022-01-14 14:59:58 +05:30
Deepesh Garg
b9b4c9aff7
Merge pull request #29270 from nextchamp-saqib/change-fieldtype 
fix: threshold fields shows incorrect currency
 2022-01-14 14:50:45 +05:30
Chillar Anand
39eb4e040c
fix(healthcare): Remove custom fields related to healthcare (#29129) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-01-14 12:37:32 +05:30
Saqib Ansari
a9ab157198 fix: remove dashboard showing only issue count 2022-01-14 11:42:34 +05:30
Deepesh Garg
08f26de3df fix: Remove comment 2022-01-13 23:05:27 +05:30
Deepesh Garg
1846dbfb4d Merge branch 'develop' of https://github.com/frappe/erpnext into nil_exempt_non_gst_gstr_1 2022-01-13 22:40:20 +05:30
Deepesh Garg
55c445cd37 fix: JSON for nil/exempt and non gst 2022-01-13 22:39:57 +05:30
rohitwaghchaure
388293dbea
Merge pull request #29280 from rohitwaghchaure/company-filter-issue-for-default-account 
fix: accounts are coming from different company in the dropdown
 2022-01-13 21:11:55 +05:30
Shariq Ansari
dd56bf205a fix: fixed card for buying workspace 2022-01-13 20:19:49 +05:30
Shariq Ansari
469bddcadf fix: minor fix 2022-01-13 19:50:26 +05:30
Deepesh Garg
24bb1e8987 fix: Test case 2022-01-13 19:44:26 +05:30
Shariq Ansari
bc187c121a fix: updated standard workspace json files 2022-01-13 19:24:11 +05:30
Marica
343f517740
Merge pull request #29271 from marination/allow-multiple-fg-in-repack 
fix: Don't validate FG in repack entry
 2022-01-13 15:27:22 +05:30
marination
c49dff385a test: Check for FinishedGoodError if 0 FG in repack entry 2022-01-13 15:02:59 +05:30
marination
3922a39591 test: Basic test one item repacked into two 
- Also run fg validation and fg marking after checking purpose, avoid unnecessary calls
 2022-01-13 14:36:21 +05:30
Rucha Mahabal
3a18e62a9b
fix: filter for leave period in Bulk Leave Policy Assignment (#29272) 
* fix: filter for leave period in Bulk Leave Policy Assignment

* fix: set title for Leave Policy Assignment
 2022-01-13 14:08:11 +05:30
marination
eac7b5d5aa fix: Allow multiple fg in repack entry 2022-01-13 13:44:20 +05:30
Rohit Waghchaure
dabe5981bb fix: accounts are coming from different company in the dropdown 2022-01-13 12:51:34 +05:30
Saqib Ansari
0e1b8322c1 fix: threshold fields shows incorrect currency 2022-01-13 12:06:03 +05:30
mergify[bot]
82b2d22627
fix(Payroll): Cannot submit salary slips from amended payroll entry. (backport #29228) (#29268) 
* fix: salary slip transaction state after payroll entry cancel

* fix: use db_set in on_cancel method

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 81f1b7dfeb68c5a70f4aa9bc0e24f7aedcd79669)

Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
 2022-01-13 11:09:36 +05:30
Ankush Menat
c80d5f70bc
Merge branch 'develop' into maint_sch_link_fix 2022-01-12 19:46:52 +05:30
Ankush Menat
eb8d08b411 fix: remove all stock UOM conversion when changing stock UOM 2022-01-12 19:41:28 +05:30
Rucha Mahabal
5cda4ea39f
fix: autoname generated for Job Applicant is too long (#29260) 
* fix: autoname generated for Job Applicant is too long

- autoname based on email and append number if exists instead of concatenating name, email, title

- add more search fields for context during selection

* test: Job applicant naming and fix related tests
 2022-01-12 19:03:36 +05:30
Mohammed Yusuf Shaikh
8b5827ed6d
fix: from time and to time not updated in drag and drop action #29114 
fix: from time and to time not updated in drag and drop action
 2022-01-12 18:49:33 +05:30
Marica
efcfb825d7
Merge pull request #29257 from marination/fix-reset-wh-defaults 
fix: Avoid resetting Default wh fields for Manufacture Entry
 2022-01-12 16:44:33 +05:30
Saqib Ansari
11fae15bec
fix(asset): check if fixed asset account is set against company (#29189) 2022-01-12 13:23:18 +05:30
rohitwaghchaure
71466c6456
Merge pull request #29179 from rohitwaghchaure/fixed-incorrect-scrap-qty-in-manufacture 
fix: incorrect scrap item qty
 2022-01-12 13:13:30 +05:30
Saqib Ansari
aef432ee2f
fix: description not fetched in sales order analytics report (#29230) 2022-01-12 13:11:21 +05:30
Rohit Waghchaure
8f0b2fa90e fix: incorrect scrap item qty 2022-01-12 11:30:20 +05:30
Marica
b5abf68b0d
Merge branch 'develop' into e-commerce-refactor-develop 2022-01-12 02:52:03 +05:30
Ankush Menat
f8119563ca fix(patch): enable all uoms on recently created sites 2022-01-11 17:49:30 +05:30
Ankush Menat
33aad4b950 fix: UOM autocomplete broken 
All new recent sites seem to have all UOMs as disabled by default. The
desired behaviour is exact opposite of this.
 2022-01-11 17:49:30 +05:30
Deepesh Garg
d6ee678ec9
Merge pull request #29193 from ruthra-kumar/bug_deferred_report 
fix: deferred report division by zero exception
 2022-01-11 17:19:08 +05:30
Saqib Ansari
c45042c00e
feat: early payment discount on sales & purchase orders (#29101) 2022-01-11 15:03:07 +05:30
Rucha Mahabal
2b33e63d2c
fix: use get_all instead of get_list while fetching SLA doctypes (#29216) 
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-11 14:40:08 +05:30
Ankush Menat
754596dfc1
fix: "update cost" should ignore overridden routing times #29154 
fix: "update cost" should ignore overridden routing times
 2022-01-11 14:20:44 +05:30
Saqib Ansari
75c8b2556e
fix(pos): cannot ignore pricing rule for one particular invoice (#29222) 2022-01-11 13:25:42 +05:30
Saqib Ansari
c62083653b
fix(gl-report): group by cost center only if include_dimensions is checked (#28883) 2022-01-11 12:45:40 +05:30
Deepesh Garg
93d784dde3 Merge branch 'develop' of https://github.com/frappe/erpnext into currency-exchange-settings 2022-01-10 21:28:53 +05:30
Deepesh Garg
ca5ea5f55f fix: test cases 2022-01-10 21:28:29 +05:30
Marica
9d36e30ef7
Merge pull request #29131 from ankush/serial_no_patch 
fix(patch): serial no whitespace trimming
 2022-01-10 19:51:26 +05:30
Ankush Menat
f195f803ff test: account reports 2022-01-10 19:14:22 +05:30
Ankush Menat
2d76c05175 refactor: unnecessary joining of lists 2022-01-10 19:14:22 +05:30
Saqib Ansari
e5b649b588
fix: pos invoices consolidation case with permlevel (#29011) 2022-01-10 18:24:08 +05:30
Deepesh Garg
3fdd47e71f Merge branch 'develop' of https://github.com/frappe/erpnext into currency-exchange-settings 2022-01-10 17:32:15 +05:30
Deepesh Garg
e2dab6f421 fix: Cleanup and fixes 2022-01-10 17:31:38 +05:30
Ankush Menat
cbaa8fdade refactor: convert query to ORM 2022-01-10 16:13:52 +05:30
Ankush Menat
0faa116f97 fix(patch): serial no whitespace trimming 
old data can contain trailing/leading whitespace which doesn't work well
with code to find last SLE for serial no.
 2022-01-10 16:02:27 +05:30
ruthra
8026f86548 refactor: get project from basic transactions 
- sales order, sales invoice, purchase order and purchase order
- if project not found in transaction, get from items
 2022-01-10 12:58:58 +05:30
Deepesh Garg
7d85755595 fix(India): NIL Rated, Exempted and non gst invoices in GSTR-1 report 2022-01-10 12:50:34 +05:30
Conn Campbell
31123436fb
fix: Task Depends on not removed from Gantt chart (#28309) 
Co-authored-by: conncampbell <conncampbell@conzu.ca>
 2022-01-10 10:28:10 +05:30
Deepesh Garg
18c4ddadf1 fix: Test case 2022-01-07 20:57:15 +05:30
Deepesh Garg
30a647ff80 fix: Handle frozen books while handling 2022-01-07 19:52:38 +05:30
Deepesh Garg
2aea078699 Merge branch 'develop' of https://github.com/frappe/erpnext into deferred_revenue_multi_currency_jv 2022-01-07 19:06:16 +05:30
Shadrak Gurupnor
25c875e447
chore: remove framework patch for custom fields (#29117) 
* chore: patches were breaking during migration

* fix: rewrote the query in query builder

* chore: removed patch from patches.txt
 2022-01-07 18:54:50 +05:30
Deepesh Garg
68723c753f
Merge pull request #29191 from frappe/mergify/bp/develop/pr-29135 
fix: Show GL balance in Accounts Receivable and Payable summary (backport #29135)
 2022-01-07 18:51:01 +05:30
Deepesh Garg
b83608b029
Merge pull request #28994 from nextchamp-saqib/zero-qty-debit-note 
fix: cannot create debit note with zero qty
 2022-01-07 18:35:24 +05:30
Deepesh Garg
2de5122262
fix: Add iteritems back 2022-01-07 18:30:19 +05:30
Deepesh Garg
00055bb159
fix: Conflicts 2022-01-07 18:11:38 +05:30
Deepesh Garg
14689a51f4 Merge branch 'develop' of https://github.com/frappe/erpnext into deferred_revenue_multi_currency_jv 2022-01-07 16:49:57 +05:30
ruthra
fe4d7f86ee fix: deferred report division by zero exception 2022-01-07 16:30:56 +05:30
Deepesh Garg
bf5930c4bb fix: Show GL balance in Accounts Receivable and payable summary 
(cherry picked from commit 1d270dca05501b5a15d19e3270188029b48eafde)

# Conflicts:
#	erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
 2022-01-07 09:35:19 +00:00
Deepesh Garg
f6f449ed18
Merge pull request #29176 from deepeshgarg007/outstanding_amount_anomaly 
fix: Inconsistency in calculating outstanding amount
 2022-01-07 13:28:52 +05:30
Dany Robert
2e5f22a370
patch: run field creation patch 2022-01-07 13:01:19 +05:30
Deepesh Garg
a456cf4225
Merge pull request #29169 from deepeshgarg007/loan_repayment_salary_slip 
fix: GL Entries for loan repayment via Salary
 2022-01-07 12:54:25 +05:30
Deepesh Garg
d28d7119b0
Merge pull request #29171 from frappe/mergify/bp/develop/pr-29155 
fix: Currency in KSA VAT report (backport #29155)
 2022-01-06 19:00:38 +05:30
Deepesh Garg
9d3a5c3184 fix: Inconsistency in calculating outstanding amount 2022-01-06 18:58:49 +05:30
Dany Robert
63a4c1d926
chore: linter style 2022-01-06 18:48:02 +05:30
Dany Robert
00b2dede14
fix: function name issue 2022-01-06 18:42:56 +05:30
Dany Robert
90eb046ce6
fix: remove unwanted fields from KSA setup 2022-01-06 18:15:40 +05:30
Ankush Menat
24fc487dd8
fix: incorrect serial no valuation report showing cancelled entries (#29172) 2022-01-06 17:03:34 +05:30
Deepesh Garg
fe929304cf fix: Currency in KSA VAT report 
(cherry picked from commit 1d87e9d8f67e3611993d638f2d422fe66acf2c00)
 2022-01-06 10:53:14 +00:00
Deepesh Garg
80dce1ab73
Merge pull request #29125 from nextchamp-saqib/fix-reverse-jv 
fix: cannot create reverse journal entry
 2022-01-06 13:30:50 +05:30
Deepesh Garg
f316aaf41e fix: GL Entries for loan repayment via Salary 2022-01-06 13:19:17 +05:30
ruthra
ca17c7226c fix: get project from PO into payment entry 2022-01-06 11:34:47 +05:30
Rucha Mahabal
26247be3b8
fix: Earned Leave allocation from Leave Policy Assignment (#29163) 
* fix: Earned Leave allocation from Leave Policy Assignment

* test: Earned Leave Allocation from Leave Policy Assignment
 2022-01-06 11:21:59 +05:30
Saqib Ansari
fcc5fa14c8
fix: failing tests of first response time (#29153) 2022-01-05 20:44:06 +05:30
Saqib Ansari
fbd706f232
fix: existing party link validation (#29159) 2022-01-05 17:55:08 +05:30
ruthra
4535a7a301 test: qty and rate changed to remove need for fractional Nos 2022-01-05 10:46:32 +05:30
ruthra
edd980acdc refactor: remove unused imports 2022-01-05 10:43:20 +05:30
ruthra
9f1e68801d test: fix failing test case payment terms status 2022-01-05 10:11:19 +05:30
Rucha Mahabal
ac816f4fed
fix(UX): validate setup on clicking Mark Attendance button in Shift Type (#29146) 2022-01-04 21:46:31 +05:30
Rucha Mahabal
72ef35bace
Merge branch 'develop' into accounting-dimension-mapping 2022-01-04 19:59:02 +05:30
Subin Tom
3febca1a9a
fix: Modifying Opening invoice creation tool timestamp (#29127) 2022-01-04 19:37:44 +05:30
Rucha Mahabal
5eeb94db31 fix: map Accounting Dimensions for Bank Entry against Payroll Entry 2022-01-04 19:21:16 +05:30
Subin Tom
19bb01c973
fix: POS items added to cart despite low qty (#29126) 2022-01-04 19:14:40 +05:30
Saqib Ansari
f4db474be0
fix: minor issues (#29130) 2022-01-04 19:12:19 +05:30
Anupam Kumar
08dcbd6fce
feat: allow user to change the parent company 2022-01-04 19:05:36 +05:30
Ankush Menat
733c9defdf
fix: update idx after updating items in so/po (#29134) 2022-01-04 18:39:30 +05:30
Chillar Anand
0900c3d655
refactor: Removed agriculture module from ERPNext (#29022) 2022-01-04 17:26:11 +05:30
Ankush Menat
e73c51bee6 test: fix test broken by todo schema change 2022-01-04 17:23:03 +05:30
Deepesh Garg
e311667a25 fix: Test case 2022-01-04 16:24:24 +05:30
ruthra
1bac793083 feat: Payment Terms Status report 
- calculate status at runtime for payment terms based on invoices
 - invoices are used in FIFO method
 2022-01-04 15:53:41 +05:30
Saqib Ansari
3aa1817f7b fix: cannot create reverse journal entry 2022-01-04 14:43:02 +05:30
Deepesh Garg
094158f287 fix: Add test case for multicurrency invoice 2022-01-04 14:04:18 +05:30
Nabin Hait
11cfa16158
fix: future recurring period calculation (#29083) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-01-04 11:38:49 +05:30
Deepesh Garg
98f294a8ae fix: Deferred revenue booking for multi currency invoices via JV 2022-01-03 19:40:47 +05:30
Saqib Ansari
7e777356ee
Merge pull request #28160 from resilient-tech/fix-invoice-statuses 
refactor: `update_invoice_status` with query builder
 2022-01-03 17:59:11 +05:30
Subin Tom
7385497219 fix: using get_batch_qty method to get available_qty 2022-01-03 16:57:00 +05:30
Subin Tom
267da48889 fix: added Sum() in query 2022-01-03 16:40:11 +05:30
Subin Tom
9e20fa85c1 fix: Removed validate_non_stock_items, filter_service_items methods 2022-01-03 14:46:53 +05:30
Saqib Ansari
568550874d
Merge branch 'develop' into pos-batch-no-stock-validation 2022-01-03 14:46:29 +05:30
rohitwaghchaure
f02e6b4631
fix: incorrect posting time fetching incorrect qty (#29103) 2022-01-03 14:28:34 +05:30
Saqib Ansari
d0f5beeb34
fix: filter query in bank reconciliation tool (#29098) 2022-01-03 11:33:03 +05:30
Subin Tom
6b973d658c
fix: sider issues 2022-01-03 10:47:13 +05:30
rohitwaghchaure
650b388bc1
Merge pull request #28458 from anupamvs/crm-carry-forward-communication-comments 
feat: carry forward communication and comments throughout the sales c…
 2022-01-03 10:19:56 +05:30
Deepesh Garg
c3d890f3f1
fix: get fiscal year based on date 2022-01-02 19:10:49 +05:30
Deepesh Garg
4b6217a683 fix: Test Case 
(cherry picked from commit 342658ea7028cc0d890200364cc08cf97e55d6d0)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
 2022-01-02 13:36:43 +00:00
Deepesh Garg
466e549842 fix(India): Tax and Charges template not getting fetched based on tax category assigned 
(cherry picked from commit 7a5937a98c3d74bdb1da79c3d5a8f49ef76ded2d)
 2022-01-02 13:36:41 +00:00
Deepesh Garg
db829a0610
Merge pull request #29050 from mohsinalimat/patch-1 
feat: Add currency in import download statement
 2022-01-02 17:15:01 +05:30
Deepesh Garg
ebc1039610
Merge pull request #29070 from frappe/pr-addded-to-po-dashboard 
refactor: Payment Request added to PO Dashboard
 2022-01-02 17:04:12 +05:30
Deepesh Garg
9c1773f56e
Merge pull request #28812 from rtdany10/ledger-merger 
feat: ledger merger
 2022-01-02 16:45:48 +05:30
Deepesh Garg
9199513de4
Merge pull request #29037 from wojosc/patch-20 
feat: update de.csv
 2022-01-02 16:29:43 +05:30
Raffael Meyer
a4e3d79bc1
revert: german translation of "Minute" 2021-12-31 17:43:10 +01:00
Raffael Meyer
538dffa617
fix: apply suggestions from review 2021-12-31 14:12:28 +01:00
Vaibhav Chopra
dbbc8d8aed
fix: leave_allocation variable not being defined (#29086) 2021-12-31 13:34:20 +05:30
Dany Robert
321730a88e
Merge branch 'develop' into ledger-merger 2021-12-31 13:02:12 +05:30
MohsinAli
72369092a3
Merge branch 'develop' into patch-1 2021-12-30 17:13:59 +05:30
Saqib Ansari
79ccf80faf
Merge branch 'develop' into zero-qty-debit-note 2021-12-29 17:32:16 +05:30
Kanchan Chauhan
8c4cdf7afc
refactor: Payment Request added to PO Dashboard 2021-12-29 16:44:20 +05:30
Saqib Ansari
689e08aca3
Merge branch 'develop' into pos-service-items 2021-12-29 14:55:20 +05:30
Pruthvi Patel
fc0dd3fcd7
Merge branch 'develop' into fix-invoice-statuses 2021-12-29 13:45:35 +05:45
Rohit Waghchaure
d9b9f4e8b7 fix: optimize patch for update bom in SO and MR 2021-12-29 10:14:03 +05:30
Deepesh Garg
b1d8815556
Merge pull request #28034 from deepeshgarg007/term_loan_enhancement 
fix: Updates in term loan processing
 2021-12-28 18:39:31 +05:30
Deepesh Garg
68d49817a1 fix: Add test for loan repayment cancellation 2021-12-28 18:10:52 +05:30
Deepesh Garg
f78bf4c6ef fix: Test cases 2021-12-28 17:40:05 +05:30
Anupam Kumar
2fd870ff15
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-28 17:21:51 +05:30
Deepesh Garg
be5e6f02ae Merge branch 'develop' of https://github.com/frappe/erpnext into term_loan_enhancement 2021-12-28 17:14:24 +05:30
Rucha Mahabal
251ed3aa74
Merge branch 'develop' into multiple-cost-centers-against-employee 2021-12-28 17:10:32 +05:30
Rucha Mahabal
88df5ce530
fix: tests (#29051) 
* fix(test): create salary slip as per timesheet dates for Project Profitability

* fix(test): reload salary slip before checking for payment days
 2021-12-28 17:09:46 +05:30
Ankush Menat
087ebcae5a
Merge pull request #29014 from ankush/rename_sr_no 
fix!: disable renaming on serial nos
 2021-12-28 15:34:50 +05:30
Deepesh Garg
6405699821
Merge branch 'develop' into mergify/bp/develop/pr-28996 2021-12-28 14:46:12 +05:30
Marica
27b157de22
Merge pull request #29057 from deepeshgarg007/unit_test_fixes 
fix: Deferred revenue test case
 2021-12-28 14:43:53 +05:30
Marica
18eb47f693
Merge pull request #28555 from marination/independent-manu-entry 
fix: Validate Finished Goods for Independent Manufacture entries as well
 2021-12-28 14:36:32 +05:30
Deepesh Garg
6f933db3cc fix: Deferred revenue test case 2021-12-28 14:16:19 +05:30
Development for People
095a6e186f
fix: rename non existent doctype field to the right one (#29055) 2021-12-28 14:08:22 +05:30
Deepesh Garg
057cfb22d6 fix: Remove debug statement 
(cherry picked from commit becb39da902e7e113c3dacb7eee7921144b8e99d)
 2021-12-28 08:11:18 +00:00
Deepesh Garg
d807d78313 fix: Issues in Bank Reconciliation tool 
(cherry picked from commit ff183ee895fb0dd1ca595eb76e2286695063315a)
 2021-12-28 08:11:18 +00:00
Marica
02b9541b43
Merge branch 'develop' into independent-manu-entry 2021-12-28 13:26:00 +05:30
marination
22809a2838 fix: Avoid Impact on Repack Entry 
- Repack entries must be considered for fg/scrap checkbox auto set
- This must be avoided only for Manufacture entries, due to confusion between scrap and fg
- No scrap in repack, so its straight forward
 2021-12-28 13:23:27 +05:30
marination
7d0340e660 fix: Sider 2021-12-28 13:06:35 +05:30
Anupam Kumar
6b9dfaea72
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-28 12:45:48 +05:30
Marica
b8c212aaef
Merge pull request #28966 from marination/stock-ageing-negative-stock 
fix: Stock Ageing Report - Negative Opening Stock
 2021-12-28 12:23:55 +05:30
Deepesh Garg
d02dcb6433
Merge pull request #29009 from deepeshgarg007/deferred_service_start_date_validate 
fix: Start date validation for deferred invoices
 2021-12-28 12:05:34 +05:30
Marica
09f26d8258
Merge branch 'develop' into stock-ageing-negative-stock 2021-12-28 11:50:00 +05:30
marination
6ca978c18b fix: Linter (extra line after import) 2021-12-28 11:46:46 +05:30
Deepesh Garg
3607f51610
Merge pull request #29021 from anupamvs/project-form-custom-btn-grouping 
fix: grouping project form custom buttons
 2021-12-28 11:08:36 +05:30
Deepesh Garg
077e2c6467
Update erpnext/projects/doctype/project/project.js 2021-12-28 11:08:13 +05:30
Anupam Kumar
1c0fa3c231
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-28 10:34:16 +05:30
MohsinAli
a0863d1cb1
feat: Add currency in import download statement 
Add currency in bank statement import
 2021-12-28 10:27:19 +05:30
Rucha Mahabal
baa12bcee6 fix: convert raw queries with frappe ORM 2021-12-28 10:04:14 +05:30
Rucha Mahabal
8226ea65c8 fix: linter issues 2021-12-28 08:54:05 +05:30
Rucha Mahabal
3c8ed4f737
Merge branch 'develop' into multiple-cost-centers-against-employee 2021-12-28 08:40:48 +05:30
marination
098f72e7ec test: Stock Ageing FIFO Slot generation 2021-12-28 02:33:54 +05:30
Marica
0eb38a4b13
Merge branch 'develop' into stock-ageing-negative-stock 2021-12-28 01:29:01 +05:30
marination
c007f84ade chore: Added .md file to explain stock ageing business logic 2021-12-28 01:27:24 +05:30
Rucha Mahabal
25f4de80b3
fix: filter out Claimed employee advances in Expense Claim (#29046) 2021-12-27 21:15:40 +05:30
marination
878fd377c2 chore: Use frappe.qb for query 2021-12-27 21:09:05 +05:30
Rucha Mahabal
21b07385ba
fix: flaky HR tests (#29017) 
* fix(test): use root company in Expense Claim tests

* fix(test): set Holiday List for Leave Allocation

* fix(test): set Holiday List for company
 2021-12-27 16:57:36 +05:30
Wolfram Schmidt
8415ec4d0c
Update de.csv 
Especially to allign Sales Orders (Aufträge) Sales Invoices (Ausgangsrechnungen) to Purchase Orders (Bestellungen) Purchase Invoice (Eingangsrechnungen). Both are a definate opposite and are kept short.
 2021-12-26 12:46:11 +01:00
Deepesh Garg
3b9bea7937 Merge branch 'develop' of https://github.com/frappe/erpnext into mergify/bp/develop/pr-28935 2021-12-26 10:25:52 +05:30
Deepesh Garg
8e4ea7e997
fix: Merge Conflicts 2021-12-26 10:23:36 +05:30
Deepesh Garg
bb6d1de221
Merge pull request #29033 from frappe/fix-iss-29032 
fix: avoid `"string" in None` condition
 2021-12-26 10:19:47 +05:30
Raffael Meyer
52397c9771
fix: avoid "string" in None condition 2021-12-26 02:15:57 +01:00
Deepesh Garg
6eb3d6a814
fix: Conflicts 2021-12-25 09:04:34 +05:30
Deepesh Garg
2d0208ba1f fix: Add round floats for price list rate 
(cherry picked from commit b60fbf5ba95350e79463f922b0e8dce518780383)
 2021-12-24 14:03:48 +00:00
Deepesh Garg
d19369b198 fix: Recalculate taxes irrespective of price list rate changed or not 
(cherry picked from commit 233f79bf960381b1c2bd753d783afd3020b377e0)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
 2021-12-24 14:03:48 +00:00
Deepesh Garg
4756fbc253 fix: Linting issues 
(cherry picked from commit 0980c2f9816b3e4a11b5410b5997a72b1cad28fd)
 2021-12-24 14:03:47 +00:00
Deepesh Garg
ab09dc545e fix(UX): Optimize rate updation of changing price list 
(cherry picked from commit 6087d5a6038d6e636ce1ba006ebd59e820b3cd8e)
 2021-12-24 14:03:47 +00:00
Anupam Kumar
cfb6b26e47
fix: contact duplication on converting lead to customer (#29001) 
* fix: contact duplication on converting lead to customer

* fix: added test case
 2021-12-24 19:13:28 +05:30
Shariq Ansari
9c4455f77c
fix: Removed ERPNext Integration Settings Workspace (#29023) 2021-12-24 18:52:35 +05:30
Anupam Kumar
87a98f8120
Merge branch 'develop' into project-form-custom-btn-grouping 2021-12-24 17:37:37 +05:30
Nabin Hait
f867f1974a fix: get fallback cost center from Employee/Department 2021-12-24 17:34:34 +05:30
Rucha Mahabal
6eeea0a77a
fix: ignore links while setting default notification templates in Settings (#29019) 2021-12-24 17:20:23 +05:30
Anupam
9c0f6d1306 fix: sider issue 2021-12-24 16:51:50 +05:30
Nabin Hait
f152a40b28 feat: Provision to assign multiple payroll cost centers against a single employee 2021-12-24 16:23:33 +05:30
Anupam
a6d6de6c4f fix: grouping project form custom buttons 2021-12-24 15:34:24 +05:30
Anupam
e7ac774bbc fix: review chnages 2021-12-24 14:12:53 +05:30
Anupam Kumar
662c412e8b
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-24 14:09:23 +05:30
Ankush Menat
7987a46509
chore: add running stock value difference in invariant report (#29012) 
[skip ci]
 2021-12-23 21:13:22 +05:30
Rucha Mahabal
ae929d7a63
fix(test): Leave Allocation validation against Leave Application after submit (#29005) 
* fix(test): Leave Allocation validation against Leave Application after submit

* chore: clean-up Leave Allocation tests

* fix(test): set holiday list for leave allocation test
 2021-12-23 19:18:05 +05:30
Deepesh Garg
7ad149f9fe fix: Start date validation for deferred invoices 2021-12-23 14:39:20 +05:30
Saqib Ansari
2be5104848 fix: cannot save debit note with zero quantity 2021-12-23 11:52:10 +05:30
Anupam Kumar
f16a88e42c
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-23 03:02:58 +05:30
Subin Tom
ec37930404 fix: Allowing non stock items in POS 2021-12-22 19:14:47 +05:30
Saqib
f6d5534627
fix: set resolution by only if not on hold (#28995) 2021-12-22 19:05:18 +05:30
Saqib Ansari
04ea42ce52 fix(sales-invoice): cannot create debit note with zero qty 2021-12-22 13:23:42 +05:30
Pruthvi Patel
617f7565ce
Merge branch 'develop' into fix-invoice-statuses 2021-12-21 22:16:14 +05:45
Ankush Menat
db7aef2fef
style: better labels for SLE fields (#28988) 
* style: better labels for SLE fields

* style: rename stock queue field

[skip ci]

Co-Authored-by: marination <maricadsouza221197@gmail.com>
 2021-12-21 17:39:27 +05:30
Saqib
7f786e44a1
Merge branch 'develop' into pos-batch-no-stock-validation 2021-12-21 17:05:43 +05:30
Saqib
c3a9ca09d1
chore: remove extra whitespace 2021-12-21 17:05:36 +05:30
Saqib
9c8f523537
fix: typo 2021-12-21 17:01:10 +05:30
Anupam Kumar
b37bc7252d
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-21 15:48:41 +05:30
Development for People
076cb408db
fix: missed colon (#28979) 2021-12-21 15:48:31 +05:30
Anupam Kumar
27448b9009
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-21 15:47:33 +05:30
Anupam
2abbf20da1 fix: test case 2021-12-21 14:13:40 +05:30
Ganga Manoj
1ed30ee7c7
fix: Reset value_after_depreciation on reversing journal entry during Asset return 2021-12-21 13:59:53 +05:30
Deepesh Garg
98ac47caa4 fix: Add is reverse charge in country wise tax 
(cherry picked from commit 7e912db4b13ee2b1b88a68fc6110eb527a0375d5)
 2021-12-21 08:12:09 +00:00
Deepesh Garg
cbef04fded chore: Remove patch comment 
(cherry picked from commit 7c1bfe6b46ac3deedacfa666d0695b53b86ec3f6)

# Conflicts:
#	erpnext/patches.txt
 2021-12-21 08:12:08 +00:00
Deepesh Garg
12a65eef8a fix: Is Reverse Charge check in Tax Category 
(cherry picked from commit b33fd6acc769dbfaa43c665c19f378e8e041d010)

# Conflicts:
#	erpnext/patches.txt
 2021-12-21 08:12:08 +00:00
Anupam
107b405560 fix: test case 2021-12-21 13:35:15 +05:30
Marica
d7c4b8a383
Merge branch 'develop' into independent-manu-entry 2021-12-21 12:55:12 +05:30
Anupam Kumar
c847130ae9
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-21 12:52:09 +05:30
marination
24a35c69c0 fix: Sider and Server side test 
- args passed to wrong function
- missing space around '='
 2021-12-21 12:52:03 +05:30
Saqib
da67403bbd
Merge branch 'develop' into so-days-taken-to-deliver 2021-12-21 12:41:48 +05:30
Subin Tom
98d417602f
fix: Added filter for dispatch address (#28937) 2021-12-21 12:35:44 +05:30
Anupam Kumar
a8637cc7b8
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-21 11:27:47 +05:30
Anupam
e4ee55c9b9 fix: test case 2021-12-21 11:26:53 +05:30
Rucha Mahabal
92e86f2f09
fix: fetch appointment letter content in the same order as template (#28968) 2021-12-20 22:56:15 +05:30
Ankush Menat
d7148adee5
test: remove unnecessary creation of companies #28965 
test: remove unnecessary creation of companies
 2021-12-20 22:00:31 +05:30
Marica
d209e5d6c5
Merge branch 'develop' into independent-manu-entry 2021-12-20 21:55:38 +05:30
marination
8951a5c267 fix: Linter (imports) 2021-12-20 21:53:47 +05:30
marination
0f43792dbb fix: Stock Ageing Report - Negative Opening Stock 
- Consider negative opening stock in logic and neutralise it with +ve stock
- minor code refactor: class for FIFOSlots to generate chronological FIFO queue
 2021-12-20 21:33:59 +05:30
Ankush Menat
2bb7bca464 test: bin qty on backdated SR 2021-12-20 20:05:49 +05:30
Ankush Menat
ff9a6e8e89 fix: correct bin qty on backdated transactions 
When making a backdated transactions current balance qty depends on
evaluation of whole ledger inbetween, instead of doing that just fetch
the last sle's qty_after_transaction when future transactions are
detected against SLE

fix: don't update bin's actual_qty

1. it's already updated by repost_current_voucher
2. update if future sle exists
 2021-12-20 20:05:49 +05:30
Anupam Kumar
66a10c0e73
Merge pull request #28440 from anupamvs/crm-lead-validate-cleanup-develop 
fix: lead validate function cleanup
 2021-12-20 18:12:57 +05:30
Deepesh Garg
c5c7777bd5
Merge pull request #28959 from deepeshgarg007/consolidated_balance_return_fix 
fix: Error on viewing consolidated financial statement
 2021-12-20 17:13:12 +05:30
Ankush Menat
f5d5281119 chore: drop deprecated qunit tests 2021-12-20 17:03:10 +05:30
Deepesh Garg
5d6199cf35 fix: Error on viewing consolidated financial statement 2021-12-20 16:54:52 +05:30
Anupam
c6a87125e9 feat: added forward communication comments check in CRM Settings 2021-12-20 14:14:44 +05:30
Anupam Kumar
ecafea9064
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-20 13:37:00 +05:30
Pruthvi Patel
16a90d3e60
Update erpnext/controllers/accounts_controller.py 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-12-20 13:24:19 +05:30
Pruthvi Patel
4d48ca4228 test: update_invoice_status 2021-12-20 13:23:14 +05:30
Ankush Menat
107b404105 chore: rename FifoValuation to FIFOValuation 2021-12-20 13:20:03 +05:30
Ankush Menat
745caf911a perf: specify slots on FIFO queue 2021-12-20 13:20:03 +05:30
Ankush Menat
aa0e163b1f test: hypothesis tests for FIFO queue 2021-12-20 13:20:03 +05:30
Ankush Menat
9d177433cb fix: return consumed bin on collapsing queue 2021-12-20 13:20:03 +05:30
Ankush Menat
a00d8d02b2 refactor: outgoing rate and defaults for remove_stock 2021-12-20 13:20:03 +05:30
Ankush Menat
db1c0889d3 feat: get consumed bins from Fifo queue on pop 2021-12-20 13:20:03 +05:30
Ankush Menat
1833f7ab81 test: FifoValuation tests 2021-12-20 13:20:03 +05:30
Ankush Menat
e6e679cf7a fix: round off if near zero while popping from queue 2021-12-20 13:20:03 +05:30
Ankush Menat
a71b476652 feat: repr, eq and iter for fifo queue 2021-12-20 13:20:03 +05:30
Ankush Menat
4b29fb6d08 refactor: move Fifo Valuation to a new class 2021-12-20 13:20:03 +05:30
Pruthvi Patel
0799f378b4 fix: consider Discounted status 2021-12-20 13:18:42 +05:30
Pruthvi Patel
6c96ed4e11 refactor: update_invoice_status with query builder 2021-12-20 13:18:42 +05:30
Anupam
0e0e4f723f fix: test case 2021-12-20 09:48:40 +05:30
Anupam Kumar
87986aee39
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-18 20:13:49 +05:30
Anupam
ba6a6bf391 Merge branch 'crm-carry-forward-communication-comments' of https://github.com/anupamvs/erpnext into crm-carry-forward-communication-comments 2021-12-18 20:13:18 +05:30
Anupam
5b40d9e7cd fix: linter issues 2021-12-18 20:12:57 +05:30
Dany Robert
c68b2c3763
Merge branch 'develop' into currency-exchange-settings 2021-12-18 18:32:12 +05:30
Dany Robert
fb6bc05138
Merge branch 'develop' into ledger-merger 2021-12-18 17:06:31 +05:30
Dany Robert
0ca467a28f
fix: remove rounding of avg rating (#28945) 2021-12-18 16:16:47 +05:30
Saqib
1abdcf2bea
Merge branch 'develop' into multiple-pricing-rule-fix 2021-12-18 12:13:33 +05:30
Dany Robert
e75295a151
Merge branch 'develop' into ledger-merger 2021-12-18 11:32:20 +05:30
Anupam Kumar
321c95d024
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-17 23:09:48 +05:30
Dany Robert
ab7f38224f fix: remove db commit 2021-12-17 16:42:24 +00:00
Dany Robert
32e5db7cb8 chore: styling according to linter 2021-12-17 16:38:16 +00:00
Dany Robert
399446460a feat: tests 2021-12-17 16:18:42 +00:00
Subin Tom
e85da7a03a
fix: Add Invoice Number field to list view in Opening Inv Creation Tool (#28938) 2021-12-17 21:48:10 +05:30
Anupam Kumar
603b367568
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-17 19:22:27 +05:30
Anupam
31ac1011b8 feat: made carry-forward comments/communication configurable and added test cases 2021-12-17 19:21:08 +05:30
mergify[bot]
c1a0f649cb
fix: convert asynchronous field update to synchronous (#28930) 
(cherry picked from commit 5adf85f5b7ba94591381b03709b1fee6aa9331a5)

Co-authored-by: Dan Navarro on Ubuntu Work <danjeremynavarro@gmail.com>
 2021-12-17 19:06:19 +05:30
Dany Robert
b3a3367d1d feat: allow group accounts 2021-12-17 13:06:30 +00:00
Noah Jacob
b98c61f2a7 refactor: moved purpose table mandatory check to server 2021-12-17 13:47:39 +05:30
Noah Jacob
90d32006f4 fix(test): fixed test case not creating serials 2021-12-17 13:32:30 +05:30
Deepesh Garg
b139ee1777
Merge pull request #28911 from nextchamp-saqib/fix-ksa-pf 
fix(ksa): enable ksa pos invoice print format
 2021-12-17 13:04:28 +05:30
Deepesh Garg
238403d3f6
Merge pull request #28916 from deepeshgarg007/multicurrency_subscription 
fix: Multicurrency invoices using subscription
 2021-12-17 12:29:10 +05:30
Noah Jacob
450369dbae
Merge branch 'develop' into maint_sch_link_fix 2021-12-17 12:07:26 +05:30
Noah Jacob
9109660a69 test: added test for serial no. filters 2021-12-17 11:57:17 +05:30
Noah Jacob
4cb5b627a1
fix: mapping to maintenance visit gets erased (#28917) 
* fix: mappings to maintenance visit gets erased

* test: mapping of schedule to visit
 2021-12-16 23:06:48 +05:30
Ankush Menat
6ba8f7644d
chore: ledger invariant check report (#28921) 2021-12-16 22:31:31 +05:30
Deepesh Garg
6ab753015e fix: Add tests for multicurrency subscription 2021-12-16 17:38:29 +05:30
Deepesh Garg
0e4842b986 fix: Multicurrency invoices using subscription 2021-12-16 16:51:41 +05:30
Subin Tom
68beee2a00 fix: replaced sql query with frappe.qb 2021-12-16 13:26:21 +05:30
Saqib Ansari
564d23fa8d fix(ksa): enable ksa pos invoice print format 2021-12-16 11:19:03 +05:30
Subin Tom
9f235526d4 fix: Validation in POS for item batch no stock quantity 2021-12-15 22:34:44 +05:30
DeeMysterio
2be62c279f
feat: provision to have limited parameters for in-process quality ins… (#28549) 
* feat: provision to have limited parameters for in-process quality inspection

* chore: formatting
 2021-12-15 19:41:30 +05:30
Ankush Menat
228e011819
perf: remove forcing of posting sort index on stock balance (#28902) 
mysql is generally smart enough to figure out which index is better
based on cardinality of index. While posting sort index is better for
low item high # of SLE scenario it's bad for high item variety each with
lower count of SLEs.
 2021-12-15 19:18:41 +05:30
Saqib
6acdb2f00b
feat: Home Onboarding (#28551) 2021-12-15 18:02:54 +05:30
Noah Jacob
af2e95d192
Merge branch 'develop' into maint_sch_link_fix 2021-12-15 15:42:23 +05:30
Noah Jacob
c872aa43f8 fix(patch): updates maintenance schedule field for old docs 2021-12-15 15:27:41 +05:30
Noah Jacob
4f52b86d7e refactor: update_serial_no function and code cleanup 2021-12-15 15:24:39 +05:30
HENRY Florian
29f6852c13
feat: Manufacturing : in BOM Operation time can be fix (#27063) 
* feat: Operation time can be fixed

* better coding without duplicate code

* change modified date foir doctype

* undo change

* fix varmixing

* fix varmixing

* fix: remove f-string that's not required anymore

* refactor: use ORM instead of raw query

* fix: improve description

* test: basic test for fixed time

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-15 15:08:31 +05:30
Jannat Patel
af202e715d
Merge branch 'develop' into home-onboarding 2021-12-15 14:28:09 +05:30
Jannat Patel
aba36eb2be Merge branch 'home-onboarding' of https://github.com/pateljannat/erpnext into home-onboarding 2021-12-15 14:26:47 +05:30
Jannat Patel
63618cc7ab fix: titles and order 2021-12-15 14:26:44 +05:30
Deepesh Garg
64f68d5e94
Merge branch 'develop' into deferred_report_revenue_and_expense 2021-12-15 14:14:34 +05:30
Subin Tom
5c4d3f89d2
feat: 'Invoice Number' field in Opening Invoice Creation Tool (#28844) 2021-12-15 14:14:16 +05:30
Subin Tom
be103ab8e6
fix: Currency fix for cost field in subscription plan (#28821) 2021-12-15 13:01:48 +05:30
Saqib
2411477e6d
fix: time to response shows failed (#28895) 2021-12-15 11:45:34 +05:30
Saqib
56bc8a52f4
Merge branch 'develop' into home-onboarding 2021-12-15 10:40:40 +05:30
Saqib
8aa9481a11
Merge branch 'develop' into so-days-taken-to-deliver 2021-12-15 10:36:47 +05:30
Saqib
39c6f661f1
revert: "fix: expected value after useful life validation" 2021-12-15 10:34:11 +05:30
Saqib Ansari
5a7a9a598b chore: rename redefinition of multiple pricing rule test 2021-12-15 10:32:23 +05:30
Saqib
5cf5412827
Merge pull request #28887 from nextchamp-saqib/sla-fixes-#1 
fix: reset_expected_response_and_resolution on hold
 2021-12-15 09:57:58 +05:30
Rucha Mahabal
a481a7c90e
fix(test): Employee Exit Summary (#28888) 2021-12-14 22:03:44 +05:30
ruthra
9ec8841b91 refactor: rename checkbox and translations 
- rename checkbox and make it
 - added translation text for labels
 - fixes for linter error
 2021-12-14 20:59:14 +05:30
Saqib Ansari
0add80b02f fix: failing tests 2021-12-14 20:24:29 +05:30
ruthra
9232f75998 refactor: change field to duration and fetch elapsed seconds 2021-12-14 19:45:09 +05:30
Saqib Ansari
c5fcbeff7a fix: reset_expected_response_and_resolution on hold 2021-12-14 18:45:27 +05:30
Ankush Menat
96ef88d935
test: remove commits from tests (#27939) 
* test: remove commits from tests in selling module

* test: remove commits from manufacturing module

* test: remove commits from accounts module tests

* test: remove commits from controller tests

* test: keep commits in accounting dimension test

* Revert "test: remove commits from controller tests"

This reverts commit f5cfbee5da844f8b2bffeee907ac602754f16ff4.

* Revert "test: remove commits from accounts module tests"

This reverts commit df4c27efddf355e2731a18e8871e54d18590f219.
 2021-12-14 17:36:35 +05:30
Ankush Menat
66960cf050
fix: remove set only once from valuation method (#28876) 2021-12-14 17:12:46 +05:30
Ankush Menat
80f1a8c645
fix: incorrect logic for "Reserved Qty for Production" (#28880) 
* fix: reservation for production incorrect

The query uses case to decide what fields to compute reservation on,
this case is outermost case hence the very first Work order's "Skip
transfer" is considered for ALL work orders.

Solution: move the case inside Sum.

Steps to reproduce:
1. Make work order for more than 1 qty (with | without skip transfer)
2. Create manufacture and transfer entries.
3. Keep checking reserved quantities during this process.

* test: use default warehouse for testing reservation
 2021-12-14 17:02:42 +05:30
Anupam Kumar
ea5e155823
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-14 16:42:59 +05:30
ruthra
a8a598ace7 refactor: remove unused function 'get_postings' 2021-12-14 16:34:51 +05:30
aaronmenezes
304aa44feb
fix: Nonstock item showing in Itemwise Recommended Reorder Level report (#28873) 2021-12-14 15:18:03 +05:30
Saqib Ansari
c0d1f4869f test: add test_multiple_pricing_rules 2021-12-14 14:58:31 +05:30
Saqib Ansari
1e17d6a607 fix: qty filter not working if apply_multiple_pricing_rules is enabled 2021-12-14 14:58:20 +05:30
Rucha Mahabal
b027050f77
Merge pull request #28845 from ruchamahabal/fix-salary-slip-timesheet 
fix: incorrect amount based on payment days in timesheet salary slip
 2021-12-14 14:57:21 +05:30
Ankush Menat
7fd06108bf
fix: reorder patch to fix custom field options (#28866) 2021-12-14 13:03:53 +05:30
Deepesh Garg
6749d8e6c9
Merge pull request #28832 from deepeshgarg007/ksa_e_invoice_patch_fix 
fix: KSA QR field rename patch
 2021-12-14 12:47:58 +05:30
Noah Jacob
cc8c0595e2
fix(UX): hide RM table(Job Card) if material transfer is against work order (#28746) 2021-12-14 12:20:04 +05:30
Noah Jacob
db46257a3b
feat: added required_date field to set date in child table (#28432) 
* feat: added required_date field to set date in child table

* fix: dont refresh full table

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-14 12:12:33 +05:30
Ankush Menat
534c64abcd
fix: packing slip incorrect item value (#28862) 2021-12-14 11:55:09 +05:30
Saqib
ae71b704ff
Merge pull request #28783 from nextchamp-saqib/hsn-wise-summary-report-fix 
fix: hsn-wise summary is incorrect if an invoice has repeated item code
 2021-12-13 22:39:32 +05:30
Saqib Ansari
2137e56947 revert: "fix: expected value after useful life validation" 2021-12-13 22:34:54 +05:30
Saqib
4984513597
Merge pull request #28677 from GangaManoj/fix-adjust-asset-value 
fix: Fix 'Adjust Asset Value' button
 2021-12-13 21:51:09 +05:30
Saqib
ce80585d51
fix: Clear Depreciation Schedule before modification (#28507) 2021-12-13 21:49:43 +05:30
Saqib Ansari
6a239c8ea3 test: test_hsn_summary_for_invoice_with_duplicate_items 2021-12-13 20:58:35 +05:30
Saqib
c3e0de28b1
fix: validate if asset account is set against company 2021-12-13 20:13:53 +05:30
Jannat Patel
74d086ffd1
Merge branch 'develop' into home-onboarding 2021-12-13 17:51:38 +05:30
ruthra
2813e5ee29 feat: new column 'Time taken to Deliver' in sales order analysis 2021-12-13 12:26:23 +05:30
Ankush Menat
a388096c03
Merge pull request #28839 from ankush/migration_hashes 
fix: remove migration hashes from doctypes
 2021-12-13 11:27:27 +05:30
Saqib
7d0a3e4e8b
Merge pull request #28550 from nextchamp-saqib/fix-sla 
refactor(SLA): Application of SLA and its fields
 2021-12-13 10:29:56 +05:30
Rucha Mahabal
bb97309e2e fix: tests 
- specify sorting order in employee exits query

- rollback after work order tests
 2021-12-12 23:20:04 +05:30
Rucha Mahabal
e93694d0ab fix: missing import 2021-12-12 23:02:44 +05:30
Rucha Mahabal
1867bad693
Merge branch 'develop' into exit-interview 2021-12-12 22:13:11 +05:30
Saqib Ansari
e74739a677 fix: hsn-wise summary is incorrect if an invoice has repeated item code 2021-12-12 19:53:33 +05:30
Deepesh Garg
b966c45fa8
Merge pull request #28748 from deepeshgarg007/accounts_receivable_jv_due_date 
fix: Ageing in AR/AP report for advances
 2021-12-12 17:27:21 +05:30
Deepesh Garg
a6fba7f128
Merge pull request #28764 from deepeshgarg007/tds_report_fixes 
fix: TDS Monthly payable report
 2021-12-12 17:11:58 +05:30
Deepesh Garg
14d03a9446 fix: KSA QR field rename patch 2021-12-12 12:55:30 +05:30
Himanshu
624481be6f
feat(buying): quotation number in supplier quotation (#28420) 2021-12-11 11:51:59 +00:00
ruthra
c3453cd73c feat: Deferred Revenue and Expense report 
- show deferred revenue and expense with actual and expected postings
 - unit tests added
 2021-12-10 19:30:43 +05:30
Dany Robert
75de5be53e fix: import issue and minor fixes 2021-12-10 10:27:15 +00:00
Dany Robert
614b9270e7 fix: convert whitespace to tabs 2021-12-10 09:45:00 +00:00
Dany Robert
7554f11260 feat: progress bar, account name field 2021-12-10 08:45:47 +00:00
Ankush Menat
75bc404cbe test: stock frozen validation 2021-12-10 12:39:38 +05:30
Ankush Menat
d37541d3fb fix: ensure that reposting is finished before freezing stock/account 2021-12-10 12:31:49 +05:30
Dany Robert
b7cc20eac0 Merge branch 'develop' of https://github.com/rtdany10/erpnext into ledger-merger 2021-12-09 15:26:45 +00:00
Dany Robert
75f8117daf feat: merge functionality 2021-12-09 15:23:10 +00:00
Dany Robert
57a7633f9b feat: form updates and progressbar 2021-12-09 15:22:46 +00:00
Noah Jacob
f1c0190f02
feat: added QI link in Job Card Dashboard (#28643) 2021-12-09 20:21:17 +05:30
Dany Robert
ad5d7897a8 feat: ledger merger doctype 2021-12-09 13:31:54 +00:00
Sagar Sharma
6485ac4e59
fix: misleading "Set Default X" fields after saving (#28798) 
* fix: misleading "Set Default X" fields after saving

* refactor: remove unncessary code and minor formatting

* fix: extend to more doctypes and correct fieldnames

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-09 17:04:00 +05:30
Ankush Menat
c64d5028b4
fix: deduplicate after finishing the repost (#28803) 
Not really a bug but avoids potential of prematurely skipping something
if failure occurs and failure isn't resolved.
 2021-12-09 13:45:44 +05:30
Michael Köller
f043f59324
fix: wrong german translation of abbreviation PAN 
Wrong german translation of abbreviation: PAN
 2021-12-09 11:31:25 +05:30
Deepesh Garg
121f8ae865
Merge pull request #28776 from rtdany10/ksa-vat-updates 
feat(Regional): KSA E-Invoing optimizations and POS support
 2021-12-08 22:32:24 +05:30
Ganga Manoj
51c707a0ce
Merge branch 'develop' into fix-adjust-asset-value 2021-12-08 19:20:23 +05:30
Ganga Manoj
539cba1b15
Merge branch 'develop' into fix-clear-depr-schedule 2021-12-08 19:19:33 +05:30
Ankush Menat
96a019ec49 test: add multi-batch negative qty test 2021-12-08 15:52:40 +05:30
Ankush Menat
f0152d03a4 test: simplfy test and expect specific exception 2021-12-08 15:52:40 +05:30
Ankush Menat
9c90b7a40d refactor: remove redundant batch qty validation 
This check was only checking total sum, which is problamatic when making
backdated entries that can cause intermediate values to go negative
while overall values stay positive.
 2021-12-08 15:52:40 +05:30
Ankush Menat
5eba57528c fix: check future negative stock for batches 
batch's ledger is only maintained in form of `actual_qty` on batch's
SLEs. To validate if batch has any negative qty in future, cumulative
total of `actual_qty` is required to ensure it never goes negative.
 2021-12-08 15:52:40 +05:30
18alantom
1cbeba5f1d test: check execution of illegal stock entry seq 2021-12-08 15:52:40 +05:30
aaronmenezes
90b98440e2
fix: Maintenence Visit -Purpose (item ) tables is not visible on submitted or saved entries (#28792) 2021-12-08 14:48:19 +05:30
Deepesh Garg
d5380dd716 fix: Error on Invoice generation 
(cherry picked from commit 82255293c4eb8a9f586db083d19d63c1ea435fb9)
 2021-12-08 08:42:29 +00:00
Dany Robert
4a316550f4 chore: POS invoice format changes 2021-12-08 07:25:41 +00:00
Deepesh Garg
948b67b744
Merge branch 'develop' into ksa-vat-updates 2021-12-08 09:38:11 +05:30
Dany Robert
3e97492da4
fix: replace frappe.get_all 2021-12-08 08:03:30 +05:30
Dany Robert
5b20746311
chore: switch to ORM method 2021-12-08 07:53:45 +05:30
Dany Robert
ca85094728
chore: switch to frappe.db.set_value 2021-12-08 07:52:06 +05:30
Rucha Mahabal
dcbf0c9eca fix: tests and sider issues 2021-12-07 23:40:10 +05:30
Dany Robert
0592096c62
Merge branch 'develop' into currency-exchange-settings 2021-12-07 22:36:36 +05:30
Deepesh Garg
cb21dff882 fix: Error on creating invoice 
(cherry picked from commit e11515a3561eac6d33d21190cac2db112ae301fb)
 2021-12-07 16:51:02 +00:00
Dany Robert
15373f1b2d
fix: intendation error 2021-12-07 18:34:34 +05:30
Dany Robert
45fce5a64b
chore: linters 2021-12-07 18:29:16 +05:30
Dany Robert
2df641eb54
feat(Regional): rename qr field and disable print formats 2021-12-07 18:13:35 +05:30
Dany Robert
9c68d8e35c
Merge branch 'frappe:develop' into ksa-vat-updates 2021-12-07 18:10:26 +05:30
Dany Robert
a0aeacee8e fix: reload doc 2021-12-07 12:39:39 +00:00
Dany Robert
bb3119cd1f feat(Regional): enable KSA print formats on setup 2021-12-07 11:05:41 +00:00
Dany Robert
293d981af9 feat(Regional): POS Invoice format for KSA 2021-12-07 11:03:22 +00:00
Dany Robert
2256155e80 feat(Regional): patch to disable ksa print formats for other countries 2021-12-07 11:02:28 +00:00
Dany Robert
09f178ceee fix: disable ksa vat invoice by default 2021-12-07 11:01:37 +00:00
Dany Robert
c5c47e9fad feat: generate QR Code for POS transactions 2021-12-07 11:01:02 +00:00
Ankush Menat
6efbbb1058
fix: ignore mandatory fields while creating WO from SO (#28772) 
If fields are made mandatory from customizations the WO creation simply
fails.
 2021-12-07 16:26:14 +05:30
Rucha Mahabal
4686527928
Merge branch 'develop' into exit-interview 2021-12-07 16:23:31 +05:30
Rucha Mahabal
c305ff911f test: Employee Exits Report 2021-12-07 16:22:17 +05:30
Deepesh Garg
3e1591c145
Merge pull request #28731 from deepeshgarg007/better_deferred_revenue_error_logging 
fix: Better Error logging for deferred revenue/expense booking
 2021-12-07 15:42:05 +05:30
Dany Robert
b3bd14fcfa
Merge branch 'frappe:develop' into ksa-vat-updates 2021-12-07 15:33:27 +05:30
Dany Robert
811e51fb50
fix: reload SI meta before checking 2021-12-07 15:21:51 +05:30
Ankush Menat
ca230e4267
test: index test should pass without calling function #28771 
test: index test should pass without calling function

[skip ci]
 2021-12-07 15:11:31 +05:30
Rucha Mahabal
ef38b127ae chore: fix report column widths 2021-12-07 15:02:00 +05:30
Rucha Mahabal
8db21e065c test: Exit Interview 2021-12-07 14:55:17 +05:30
Dany Robert
848b641d7b
fix: rename KSA QR field to match localisation 2021-12-07 14:51:05 +05:30
Rucha Mahabal
0a937dc050 fix: show Exit Questionnaire button only to the users with write access 
- fix linter issues
 2021-12-07 13:04:23 +05:30
Dany Robert
d06c4b50cd
feat: create QR field in POS Invoice 2021-12-07 12:29:59 +05:30
Dany Robert
f0fee5672f
chore: change QR field label 2021-12-07 12:18:32 +05:30
Dany Robert
6a6d6f7f8b
fix: localize QR fieldname 2021-12-07 12:17:45 +05:30
Dany Robert
ebd4179295
fix: get doctype from doc instead of hardcoding SI 2021-12-07 12:15:58 +05:30
Dany Robert
276bf73974
feat: create QR Code field if not existing 2021-12-07 12:11:43 +05:30
Deepesh Garg
d106d59c3f fix: TDS Monthly payable report 2021-12-06 20:36:48 +05:30
Saqib Ansari
2f7d8ac29e fix: indentation 2021-12-06 19:19:34 +05:30
Saqib Ansari
3446f7545f fix: remove 'ongoing' status from issue summary report 2021-12-06 19:17:38 +05:30
Saqib Ansari
91aa78707c fix: remove missed 'ongoing' references 2021-12-06 19:13:31 +05:30
Saqib Ansari
476e81a631 fix: time to respond & resolve indicators 2021-12-06 18:55:30 +05:30
Saqib Ansari
1a76b3801a fix: test 2021-12-06 17:06:20 +05:30
Saqib Ansari
10b87e081c fix: sider issues 2021-12-06 15:38:19 +05:30
Saqib Ansari
32c81818f6 fix: transalations 2021-12-06 15:38:01 +05:30
Deepesh Garg
3dabac15ed fix: Ageing in AR/AP report for advances 2021-12-06 15:05:20 +05:30
Saqib
8e5b793a0a
Merge branch 'develop' into fix-sla 2021-12-06 14:48:09 +05:30
Saqib Ansari
812572d250 feat: record assignment on first response failure 2021-12-06 14:46:51 +05:30
Saqib Ansari
c1d8877a83 refactor: handle special cases on communication creation 2021-12-06 14:34:59 +05:30
Ankush Menat
ef53eb7fcd
Merge pull request #28745 from noahjacob/maint_batch_map 
refactor: map serial from schedule if only one
 2021-12-06 14:34:06 +05:30
Anupam Kumar
3928a402d4
feat: CRM Settings (#27788) 
* feat: crm settings

* feat: CRM Settings

* feat: lead and opprtunity section

* feat: added CRM Settings in ERPNext Settings workspace

* fix: review chnages

* added patch

* fix: linter issues

* fix: linter issues

* fix: linter issues

* fix: removed crm settings from selling module

* fix: raw query to frappe.qb

* fix: removed hardcoded value

* fix: linter issue

* fix: simplify CRM Settings migration patch

Co-authored-by: Anupam Kumar <anupam@Anupams-MacBook-Air.local>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-12-06 13:52:00 +05:30
Noah Jacob
eb522a3746 refactor: map serial from schedule if only one 2021-12-06 13:43:02 +05:30
Saqib Ansari
f9408d170a patch: split 'ongoing' sla status 2021-12-06 12:38:25 +05:30
Deepesh Garg
c56a450474
Merge pull request #28656 from nemesis189/taxjar-nexus-display-condition 
fix: Taxjar Nexus list visible only if child table is visible
 2021-12-06 11:44:11 +05:30
Saqib
b1ba98c129
feat: Make Depreciation Entry posting more flexible (#28421) 2021-12-06 11:43:09 +05:30
Saqib Ansari
56df646067 fix(test): test_depr_entry_posting_with_income_account 2021-12-06 11:19:58 +05:30
Ankush Menat
a8375239eb test: set customer group and territory defaults 2021-12-06 11:07:24 +05:30
Ankush Menat
bdf7b8d379 fix: patch to remove default item group and territory 2021-12-06 11:07:24 +05:30
Ankush Menat
105b6d498c fix: remove bad defaults from selling settings 
"All cusotmer groups" and "All territories" are pointless defaults, not
sure why these are made default. They don't help you track anything.
"All" might as well be `Null`.

Even the filters for customer_group suggest it shouldn't be group then
having the root as default makes no sense.
 2021-12-06 11:07:24 +05:30
Rucha Mahabal
3230741cde fix: email summary 2021-12-06 10:08:51 +05:30
Rucha Mahabal
b69e0d2c63 feat: default Notification - a day before Exit Interview 2021-12-05 22:28:22 +05:30
Rucha Mahabal
1c09439d03 chore: update HR workspace 2021-12-05 22:06:19 +05:30
Rucha Mahabal
3437f568be feat: Employee Exits report 2021-12-05 21:55:13 +05:30
Rucha Mahabal
d67536cc8d feat: update Exit Interview date in employee master on submission 2021-12-05 19:55:25 +05:30
Rucha Mahabal
e30187f246 feat: bulk questionnaire sending 2021-12-05 19:32:33 +05:30
Rucha Mahabal
09fdfed163 fix: make Exit Interview submittable 2021-12-05 18:28:23 +05:30
Rucha Mahabal
1347187a30 feat: track status and final decision (Retained/Exit Confirmed) 2021-12-05 17:20:39 +05:30
Rucha Mahabal
235b707417 feat: add default Exit Questionnaire email template 2021-12-05 17:06:29 +05:30
Rucha Mahabal
7412accf6d feat: sending Exit Questionnaire 2021-12-05 17:02:19 +05:30
Rucha Mahabal
36a2d8ee0d feat: Exit Interview 2021-12-05 14:42:27 +05:30
Rucha Mahabal
0ef42d1000
fix(patch): create only component type field instead of running the whole setup (#28734) 2021-12-05 12:44:20 +05:30
Deepesh Garg
3c64e201cc fix: Log error before throwing exception 2021-12-04 20:05:37 +05:30
Deepesh Garg
0ba4fcee2a fix: Commit joural entries 2021-12-04 19:25:44 +05:30
Deepesh Garg
67a001d876 fix: Better Error logging fordeferred revenue/expense booking 2021-12-04 19:19:03 +05:30
rohitwaghchaure
fc4e6a2bed
Merge pull request #28710 from noahjacob/calc_outgoing_stock_entry 
fix: incorrect outgoing rates when material_consumption enabled
 2021-12-04 12:34:33 +05:30
Ankush Menat
ba5a7ffd60 fix: weird item sorting by idx 2021-12-03 19:08:06 +05:30
Ankush Menat
5caf411be3 fix: remove autocommit from item rename 2021-12-03 18:47:53 +05:30
Ankush Menat
72dbc3d6b8 fix!: dont allow renaming warehouse primary key 2021-12-03 18:47:53 +05:30
Noah Jacob
35346de162 test: added tests for manufacture stock entry when material_consumption is enabled 2021-12-03 17:21:49 +05:30
Saqib Ansari
defa01edac fix: undo removing of resolution_time fields 2021-12-03 16:22:10 +05:30
Saqib
7511a9ed31
fix(ksa): qrcode for invoices with special chars (#28715) 2021-12-03 16:13:44 +05:30
Deepesh Garg
a8f283bb20
Merge pull request #28708 from deepeshgarg007/ksa_qr_invoice_total 
fix: Invoice amount in KSA E Invoice QR Code
 2021-12-03 15:18:15 +05:30
Noah Jacob
7f3e6d149a fix: incorrect outgoing rates when material_consumption enabled 2021-12-03 15:11:18 +05:30
Ankush Menat
cef84c25a7 refactor: simplify the way SLEs are submitted 2021-12-03 14:51:25 +05:30
Ankush Menat
97060c45e9 refactor: replace misleading variable name 2021-12-03 14:51:25 +05:30
Deepesh Garg
f2ffddf059 fix: Invocie amount in KSA E Invoice QR Code 2021-12-03 14:32:52 +05:30
Deepesh Garg
c339240250
Merge pull request #28698 from frappe/mergify/bp/develop/pr-28654 
fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice (backport #28654)
 2021-12-03 14:26:43 +05:30
Saqib
7091ca6812
Merge branch 'develop' into fix-sla 2021-12-03 11:53:25 +05:30
Rucha Mahabal
0b1808e1ee
fix(Non Profit): fetch memberships for 80G certificate by from date only (#28700) 2021-12-03 11:46:14 +05:30
Saqib Ansari
1e550d3e46 fix: failing tests 2021-12-03 11:36:53 +05:30
Saqib
9c60c45acf
fix: Create Depreciation Schedules for existing Assets accurately (#28675) 2021-12-03 11:30:47 +05:30
Saqib
7314aee394
fix: qrcode image name for invoices with special chars (#28699) 2021-12-03 11:29:51 +05:30
Deepesh Garg
35e2bd89c0 fix: India utils code cleanup 
(cherry picked from commit 56c626adbfbd04e7e9063f6500ec380f7bfb3da4)
 2021-12-03 04:12:43 +00:00
Deepesh Garg
f12be3001d fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice 
(cherry picked from commit 6a75e8d283bb76214af832bb0a29c20eefae328c)
 2021-12-03 04:12:42 +00:00
Deepesh Garg
107fb43d6a fix: Paid showing in AR/AP report 
(cherry picked from commit 5e7ce5370f6af634f7674772529cf4933114f3ef)
 2021-12-02 13:44:27 +00:00
Saqib Ansari
6736a89b4e fix: failing tests 2021-12-02 15:54:02 +05:30
Ankush Menat
a37c99a23d
fix: dont requeue repost immediately and clear progress (#28684) 2021-12-02 14:51:04 +05:30
Saqib Ansari
a1cedc3ea0 fix: failing tests 2021-12-02 14:48:24 +05:30
Saqib Ansari
6f67bbca69 refactor(SLA): remove response_by_variance & resolution_by_variance 2021-12-02 13:39:05 +05:30
Saqib
fa42cf796b
Merge branch 'develop' into depreciate-existing-asset 2021-12-02 12:13:12 +05:30
Saqib
4889661e5c
fix: actual tax conversion in case of multicurrency invoices (#28539) 2021-12-02 11:37:08 +05:30
Saqib
92860f46ac
Merge branch 'develop' into taxjar-nexus-display-condition 2021-12-02 11:35:26 +05:30
Ganga Manoj
9bc28210c9
fix: Make buttons translatable (#28679) 2021-12-02 11:31:38 +05:30
Jannat Patel
a108df8efc fix: assigned proper form tour to onboarding steps 2021-12-02 11:27:37 +05:30
Jannat Patel
427938f87b fix: new item form tour for home onboarding 2021-12-02 11:25:47 +05:30
Saqib
38cbaa3168
Merge branch 'develop' into depreciate-existing-asset 2021-12-02 11:20:49 +05:30
GangaManoj
4629308d94 fix: Rename function 2021-12-02 01:22:18 +05:30
GangaManoj
5b224f841b fix: Rename variable 2021-12-02 01:19:35 +05:30
GangaManoj
6f1cf94c9f fix: Fix 'Adjust Asset Value' button 2021-12-02 01:18:30 +05:30
GangaManoj
828769ca70 fix: Remove unnecessary variable 2021-12-02 01:09:15 +05:30
Ganga Manoj
dc3449c304
Merge branch 'develop' into product-bundle-fixes 2021-12-01 23:27:40 +05:30
GangaManoj
774ac852c9 fix: Test if depreciation schedules are set up properly for existing assets 2021-12-01 22:51:55 +05:30
GangaManoj
de002005ac fix: Modify has_pro_rata() to include existing assets 2021-12-01 22:51:08 +05:30
GangaManoj
5c3d4caeda fix: Create Depreciation Schedules properly for existing Assets 2021-12-01 21:48:47 +05:30
GangaManoj
22cc8d2246 fix: Fix depreciation_amount calculation 2021-12-01 21:46:09 +05:30
Ankush Menat
fdffa037b5
test: dynamic fiscal year creation in tests (#28667) 2021-12-01 17:31:17 +05:30
Ankush Menat
445966ab80
test: timeout certain tests in work order to avoid stuck tests (#28666) 
[skip ci]
 2021-12-01 16:34:05 +05:30
Saqib
802d583031
Merge branch 'develop' into taxjar-nexus-display-condition 2021-12-01 15:22:39 +05:30
Dany Robert
3708cf17ad
fix(POS Profile): replace cur_frm with frm (#28390) 2021-12-01 12:14:06 +05:30
Saqib
01d8b8519f
fix: cannot load company form (#28535) 2021-12-01 12:11:30 +05:30
Subin Tom
ecc5de6159 fix: removing db call for variables 2021-12-01 11:54:59 +05:30
Sagar Vora
ab280f7142
fix: update modified timestamp for delivery note #28657 
fix: update `modified` timestamp for delivery note
 2021-12-01 11:01:49 +05:30
GangaManoj
a473e1dbe9 fix: Add item to packing list 2021-12-01 01:29:35 +05:30
Subin Tom
0963fceede fix: Taxjar Nexus list visible only if child table is visible 2021-11-30 22:05:29 +05:30
mergify[bot]
071118fa4e
fix: Unable to search project by project name in Sales Invoice (bp #28648) 
(cherry picked from commit 08b7c856b2ee94d1f8ac2c019c556eef4d7dd7da)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-11-30 13:15:20 +00:00
Deepesh Garg
ad8d296c08
Merge pull request #28636 from deepeshgarg007/zero_values_report 
feat: Show Zero Values filter in consolidated financial statement
 2021-11-30 18:15:50 +05:30
Ankush Menat
0854c183aa
chore: remove duplicate code (#28646) 
[skip ci]
 2021-11-30 17:57:53 +05:30
Raffael Meyer
e10ab1626c
feat: Grant commission on certain items only (#27467) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-11-30 17:54:18 +05:30
Rucha Mahabal
d0f4f03b66
fix: Employee Transfer and Project Profitability test cases (#28633) 
* fix: Employee Transfer testcases

* fix: Project Profitability test case
 2021-11-30 14:04:47 +05:30
Deepesh Garg
9610086d0c feat: Show Zero Values filter in consolidated financial statement 2021-11-30 13:24:23 +05:30
Ankush Menat
aeb62af544 fix(ux): remove attachment limits 2021-11-30 12:46:53 +05:30
Rucha Mahabal
4458b24813
fix: allow creating Shift Assignment for same day (#28613) 2021-11-30 10:15:41 +05:30
Anupam Kumar
83e3e58fe9
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-11-30 10:11:23 +05:30
Saqib
fb14b0901c
feat: Let serialised Items be consumed during Asset Repairs (#28349) 2021-11-29 20:42:56 +05:30
Subin Tom
2f6a6afaa8
feat(pos): Total item qty field to POS screen (#28331) 2021-11-29 20:35:49 +05:30
Ganga Manoj
7a15f85f22
Merge branch 'develop' into serialized-item-consumption 2021-11-29 20:01:11 +05:30
Deepesh Garg
0d9b0fe6dc
Merge pull request #28464 from mhbu50/develop 
fix:Change QR Code Triggerr event
 2021-11-29 18:46:56 +05:30
Deepesh Garg
4382040fb6
fix: Move trigger from on trash to on cancel 2021-11-29 18:25:47 +05:30
Deepesh Garg
641f033337
Merge pull request #28385 from vorasmit/fix-hsn_wise 
fix(regional): `hsn_wise` as false returns `item_code`
 2021-11-29 18:08:34 +05:30
rohitwaghchaure
f872878638
Merge pull request #28500 from rohitwaghchaure/feat-report-to-view-consumed-materials 
feat: report to see the consumed materials against the work order
 2021-11-29 17:53:44 +05:30
rohitwaghchaure
3d2efb76d3
fix: linters issue 2021-11-29 17:52:55 +05:30
rohitwaghchaure
56b5ac0939
Merge pull request #28611 from rohitwaghchaure/changed-fieldtype-from-int-to-float 
fix: changed fieldtype from int to float for the field Batch Size in the Work Order Operation table
 2021-11-29 17:13:24 +05:30
Deepesh Garg
2bed4140f3
Merge pull request #28605 from deepeshgarg007/ksa-e-invoice-new 
refactor(KSA VAT): QR Code as per ZATKA specification
 2021-11-29 16:46:14 +05:30
Rohit Waghchaure
7fac9b8e9c fix: changed fieldtype from int to float for the field Batch Size in the work order 2021-11-29 16:40:55 +05:30
vorasmit
e5ca9f3c1b
Merge branch 'develop' into fix-hsn_wise 2021-11-29 16:33:21 +05:30
rohitwaghchaure
570ae422a8
Update work_order_consumed_materials.py 2021-11-29 16:25:30 +05:30
Deepesh Garg
af6fc29770 fix: KSA print format for invoices not having item codes 2021-11-29 16:18:35 +05:30
Saqib
c0cc72ec1d
fix: incorrect discount amount set when item is replaced (#28556) 2021-11-29 15:05:06 +05:30
Rucha Mahabal
baf41fdc9c
fix: Employee Advance paid amount not updated on PE cancellation (#28572) 
* fix: employee advance paid amount not updated on PE cancellation

* fix: convert raw sql queries to qb

* test: Employee Advance Paid Amount on PE cancellation

* chore: disable no copy for sanctioned amount in Expense Claim
 2021-11-29 14:23:06 +05:30
Deepesh Garg
f3f7ed6f0d fix: Translations 2021-11-29 13:43:56 +05:30
Ahmad
31b9b84fdf fix: KSA VAT QR Code arabic conversion 2021-11-29 13:43:02 +05:30
Ahmad
de784d8bfe refactor: comments removed 2021-11-29 13:43:02 +05:30
Ahmad
d1746caa02 refactor(KSA VAT): QR Code as per ZATKA specification 2021-11-29 13:43:02 +05:30
Ankush Menat
c7701ace80 chore: correct docstrings 2021-11-29 13:04:29 +05:30
Ankush Menat
f862339024 fix: use get_all instead of get_list for child tables 2021-11-29 13:04:29 +05:30
Anupam Kumar
d4f57d3a4f
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-11-29 12:15:03 +05:30
Jannat Patel
8cc1dc8079
Merge branch 'develop' into home-onboarding 2021-11-29 10:24:06 +05:30
Himanshu
de6f104b74
Delete __init__.py 2021-11-27 23:16:34 +00:00
hrwx
43038aab79 fix: do not add gst fields if no indian company 2021-11-27 21:46:13 +00:00
xdlumertz
cdaf0a04cf
fix(ux): allow translations (#28455) 
* Translation

* Translations

Co-authored-by: xdlumertz <alexandrelumertz@gmail>
 2021-11-27 15:03:35 +00:00
Ankush Menat
69a17b9e51
refactor: move Bin queries to qb/orm (#28522) 2021-11-27 20:07:02 +05:30
Saqib Ansari
79f8159ab9 test: issue closing after being on hold 2021-11-27 17:14:58 +05:30
Saqib Ansari
267cc35850 fix: failing tests 2021-11-27 16:47:45 +05:30
Ganga Manoj
7bbc708e8a
Merge branch 'develop' into serialized-item-consumption 2021-11-26 20:44:35 +05:30
Saqib Ansari
214d0e367f fix: remove leading whitespace 2021-11-26 20:20:38 +05:30
Saqib Ansari
a8c75b6862 refactor: application of SLA and its metrics 2021-11-26 20:16:21 +05:30
Noah Jacob
7ff30a4b2b
fix: incorrect balance for warehouses (#28583) 2021-11-26 17:33:57 +05:30
Ankush Menat
efec85d5cd
chore: correct __version__ on develop branch. (#28582) 2021-11-26 16:29:21 +05:30
Saqib Ansari
210f593a49 refactor: SLA form fields 2021-11-26 15:49:17 +05:30
Deepesh Garg
38dfb60243
Merge pull request #27348 from deepeshgarg007/advance_tds_allocation_gl 
fix (refactor): Tax Withholding for Advances using Payment Entry against suppliers
 2021-11-26 14:28:50 +05:30
marination
dfff972a78 fix: Linter (imports) 2021-11-26 13:29:05 +05:30
Rucha Mahabal
ca8dec0cf2
fix: Use get_all instead of get_list for child doctype (#28538) 
* fix(Student Attendance Tool): Use `get_all` instead of `get_list` for child doctype

* fix(Course Schedule): incorrect fetch from value

* fix: sider

* fix(Gratuity): Use `get_all` instead of `get_list` for child doctype
 2021-11-26 13:24:32 +05:30
Marica
26207d9517
Merge branch 'develop' into independent-manu-entry 2021-11-26 13:20:33 +05:30
marination
affb29194b test: Independent Manufacture Entry 
- Check validations
- Check if FG basic rate is calculated correctly
 2021-11-26 13:19:04 +05:30
Shariq Ansari
2a5f663a1e
fix: Customer, Supplier heatmap data not rendering (#28553) 
* fix: adding get_timeline_data import on supplier.py, customer.py
 2021-11-26 12:58:43 +05:30
Saqib
9c913c9b2d
fix: over billing validation (#28218) 2021-11-26 12:00:13 +05:30
Noah Jacob
73bfd59846
fix: checkbox triggers get_items and sub_assembly buttons (#28558) 2021-11-26 11:53:35 +05:30
Deepesh Garg
7f06c8ca57 fix: Incorrect indentation 2021-11-26 10:27:57 +05:30
Deepesh Garg
f07f010962 fix: Add tests 2021-11-25 23:58:16 +05:30
GangaManoj
c94f1ed39a fix: Change order of import statements 2021-11-25 22:18:57 +05:30
GangaManoj
b28f137ee8 fix: Remove unused import 2021-11-25 22:17:54 +05:30
GangaManoj
6b75d1439f fix: Add test for consumption of serialized Assets 2021-11-25 22:10:24 +05:30
Ganga Manoj
209750d036
Merge branch 'develop' into depr-expense-account 2021-11-25 20:01:58 +05:30
Ganga Manoj
43b8936f1c
Merge branch 'develop' into fix-clear-depr-schedule 2021-11-25 20:01:06 +05:30
Ganga Manoj
a1055d6bd3
Merge branch 'develop' into product-bundle-fixes 2021-11-25 20:00:30 +05:30
Ankush Menat
87f2dcfb59
fix: total stock summary UI glitch #28564 
fix: total stock summary UI glitch
 2021-11-25 19:38:44 +05:30
GangaManoj
efac7b0904 fix: Create setUpClass 2021-11-25 19:02:01 +05:30
GangaManoj
eea80b6c01 fix: Create stock item 2021-11-25 19:01:22 +05:30
GangaManoj
c9e79ef1f2 fix: Replace 'item' with 'item_code' in tests 2021-11-25 18:53:48 +05:30
Ankush Menat
8b33358660 fix: patch failure due to new doctype 2021-11-25 17:41:29 +05:30
Ankush Menat
0a2964dc82 fix: ignore permissions while creating reposts 2021-11-25 16:37:19 +05:30
Ankush Menat
ed94f0f3f2 refactor: deduplicate during repost background job 2021-11-25 16:37:19 +05:30
Ankush Menat
55631dd0d6 test: item-wh deduplication in reposting 2021-11-25 16:37:19 +05:30
Ankush Menat
0d0e24a5f5 perf: skip unnecessary item-wh reposts 
Using basic idea that repost with older posting date will also take care
of subsequent posting dates...

When Item-WH reposts are queued:

1. If another repost with same item-wh but older posting date exists
    then skip current one.
2. If another repost with same item-wh but newer posting date exists
    then skip another one.
 2021-11-25 16:37:19 +05:30
Ankush Menat
1d3842f03a fix: dont erase voucher_type and voucher_no for item_wh repost 
kept for tracability.
 2021-11-25 16:37:19 +05:30
Ankush Menat
a5a8c9104f perf: index for item-sh on repost item valuation 
Item-WH based reposting requires querying existing similar repost.
Assuming there is only 1 max extra entry with same params just indexing
item-WH is sufficient to speed up the query.
 2021-11-25 16:37:19 +05:30
Ankush Menat
45dd46be3d feat: option to select reposting method 
In current implementation selecting Item-Warehouse based reposting is
better for few users, who don't use depenent SLEs but have frequent
transactions involving same items.

This change lets them switch to item-warehouse based reposting if
required.

Only use this if you understand technicalities of stock reposting. This
is experimental but will become mainstream in coming days.
 2021-11-25 16:37:19 +05:30
Ankush Menat
d220e08ba4 refactor: reuse get_items_to_be_repost function 2021-11-25 16:37:19 +05:30
Ankush Menat
a36c249d3d test: item-wh repost creation 2021-11-25 16:37:19 +05:30
Ankush Menat
6dc9b822bc refactor: item-wh wise reposting by default 2021-11-25 16:37:19 +05:30
Deepesh Garg
5ba3b28d69 fix(refactor): Advance tds allocation to purchase invoice 2021-11-25 15:42:30 +05:30
Marica
ffdf32b5b3
Merge branch 'develop' into cost-of-poor-quality 2021-11-25 13:29:40 +05:30
marination
42395af22a fix: Remove commented code 2021-11-25 13:28:52 +05:30
marination
8c9779d69d fix: Dont auto set is finished item or is scrap itm checkbox for independent entry 
- System cant differentiate between scrap and FG when WO is absent, so dont auto set
- User must set it manually
- `validate_finished_goods` checks this
 2021-11-25 13:23:10 +05:30
marination
d6bc121999 fix: Validate Finished Goods for Independent Manufacture entries as well 
- Check if FG exists even if WO is absent
- Check if multiple FGs are there, block.
 2021-11-25 13:18:58 +05:30
GangaManoj
c9743185c6 fix: Remove unnecessary comma 2021-11-24 21:58:42 +05:30
GangaManoj
adfd519139 fix: Test Product Bundle price calculation when there are multiple Product Bundles 2021-11-24 21:58:05 +05:30
GangaManoj
325923afc7 fix: Test that indices are reset for Packed/Bundle Items when Product Bundles are removed from the Items table 2021-11-24 21:47:06 +05:30
GangaManoj
8370042f82 fix: Reset indices in the Packed/Bundle Items table on deleting Product Bundles 2021-11-24 21:06:23 +05:30
Saqib Ansari
c46c8dd6c5 feat: do not change variance if response or resolution is set 2021-11-24 19:23:31 +05:30
Jannat Patel
5b2ba24563 fix: company tour 2021-11-24 19:19:45 +05:30
Mohammed Yusuf Shaikh
8d2abc4b86
fix: fixes in work order doctype (#28217) 
* fix: fixes in work order doctype

* fix: sider issues and disabled set only once property

* fix: set default qty to manufacture

* fix: dont manually collapse sections

* fix: remove unnecessary messages

* fix: make dependent fields read only

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-24 16:23:12 +05:30
Saqib Ansari
1f060c0b0a feat: find SLA based on customer group's ancestors 2021-11-24 14:00:18 +05:30
Saqib Ansari
9047e2b9dd refactor: do not set default priority in isssues 2021-11-24 13:52:20 +05:30
Saqib
136dd4f801
Merge branch 'develop' into product-bundle-fixes 2021-11-24 11:27:12 +05:30
Deepesh Garg
6ca5f228f8 Merge branch 'develop' of https://github.com/frappe/erpnext into advance_tds_allocation_gl 2021-11-24 10:45:02 +05:30
Ganga Manoj
6fd466a323
Merge branch 'develop' into fix-clear-depr-schedule 2021-11-24 06:10:14 +05:30
GangaManoj
0803f87660 fix: Fix Product Bundle price calculation when there are multiple Product Bundles 2021-11-24 06:07:58 +05:30
Ganga Manoj
068177d293
Merge branch 'develop' into serialized-item-consumption 2021-11-24 05:29:56 +05:30
Ganga Manoj
5ef709f569
Merge branch 'develop' into depr-expense-account 2021-11-24 05:26:40 +05:30
GangaManoj
4311936b7d fix: Edit dates and frequency of depreciation 2021-11-24 05:21:31 +05:30
GangaManoj
6ec5a19063 fix: Test if clear_depreciation_schedule() works for multiple finance books 2021-11-24 03:23:02 +05:30
GangaManoj
33a0b1db2c fix: Retain depreciation schedule rows that are linked with JEs while clearing the schedule 2021-11-24 03:16:17 +05:30
GangaManoj
f455de2924 fix: Test if multiple Depreciation Schedules are set up for multiple Finance Books 2021-11-23 23:26:32 +05:30
GangaManoj
60d82d913c fix: Test Depreciation Entry posting when Depreciation Expense Account is an Income Account 2021-11-23 23:07:27 +05:30
GangaManoj
a36713cd2d fix: Test Depreciation Entry posting when Depreciation Expense Account is an Expense Account 2021-11-23 21:03:03 +05:30
GangaManoj
d406775d1a fix: Check root_type of Depreciation Expense Account 2021-11-23 20:21:24 +05:30
Ankush Menat
ab2c1f62a1
fix: correct module for reloading doc (#28523) 2021-11-23 18:21:00 +05:30
mergify[bot]
34d1fec7de
fix: broken bom tree view and remove duplicate button (#28512) (#28527) 
* fix: broken bom tree view and remove duplicate button

(cherry picked from commit 7ae1369d64ecaa829965d89915475fbd3211b5c2)

Co-authored-by: Bhavesh Maheshwari <34086262+bhavesh95863@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-23 17:53:26 +05:30
Ankush Menat
0df9cf9526
chore: remove dead/irrelevant links from workspace (#28519) 
* chore: remove dead link to shopify settings

* chore: unlink "debug" reports from stock dashboard
 2021-11-23 15:08:51 +05:30
Deepesh Garg
0931d17a2a
Merge branch 'develop' into currency-exchange-settings 2021-11-23 12:39:25 +05:30
Ganga Manoj
5ef2330022
fix: Replace 'parent' with 'invoice_or_item' (#28513) 2021-11-23 12:28:41 +05:30
Subin Tom
1909bb569e
fix: POS Item cart only taxes with amount displayed (#28501) 2021-11-23 10:35:43 +05:30
Rucha Mahabal
5ba1bc1572
fix: Employee link formatter showing incorrect value for Employee Name (#28504) 2021-11-23 09:30:30 +05:30
GangaManoj
406278b5c1 fix: Add bundle items to PO only if the Product Bundle was selected from the SO 2021-11-23 04:51:53 +05:30
Ganga Manoj
2e01b40465
Merge branch 'develop' into fix-clear-depr-schedule 2021-11-23 02:41:04 +05:30
GangaManoj
475d8394e4 fix: Clear Depreciation Schedule entries that aren't linked with Journal Entries before modifying the schedule 2021-11-22 21:51:32 +05:30
Rucha Mahabal
e7eef9601d
fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim (#28497) 
* fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim

* fix: Expense Claim Advance form labels
 2021-11-22 20:13:15 +05:30
Deepesh Garg
056e3b199c
Merge pull request #28469 from nemesis189/new-company-setup-fy-query 
fix: FY query returning None for new company
 2021-11-22 19:23:07 +05:30
Rohit Waghchaure
db9bd5b912 feat: report to see the consumed materials against the work order 2021-11-22 18:01:20 +05:30
Deepesh Garg
e8370147e8
Merge pull request #28489 from deepeshgarg007/ksa_print_format 
fix: KSA Invoice print format for multicurrency invoices
 2021-11-22 16:34:34 +05:30
Deepesh Garg
73c56510d8 fix: Delete KSA vat setting on deleting company 2021-11-22 14:21:53 +05:30
Subin Tom
fce4f34325
fix: POS string translation (#28381) 2021-11-22 13:34:26 +05:30
Deepesh Garg
42c40b33bc fix: KSA Invoice print format for multicurrency invoices 2021-11-22 13:20:43 +05:30
Sagar Sharma
aa689874e3
fix: Closed status error in Work Order Summary (#28460) 
* fix: Closed status error in Work Order Summary

* chore: use get_meta to get status options

* refactor: simplify code

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-22 13:06:59 +05:30
Anupam Kumar
b8ef8bcde9
Merge branch 'develop' into manufacturing-work-order-closed 2021-11-22 12:56:15 +05:30