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

1807 Commits

Author SHA1 Message Date
Anurag Mishra
fc98abece9
feat: Employee Grievance (#25705) 
* feat: Employee Grievance

* feat: link to desk and automatic unsuspend

* test: Employee Grievance

* fix: Sider and Translation

* fix: sider

* fix: formatting

* feat: changes requested

* feat: Employee Grievance

* feat: link to desk and automatic unsuspend

* test: Employee Grievance

* fix: Sider and Translation

* fix: sider

* fix: formatting

* feat: changes requested

* fix: patch test and sider issue

* fix: make Employee Responsible non-mandatory since there cannot be an employee responsible for all sorts of grievances

- show pay cut and suspension buttons only if Employee Resposible is set

- some label changes

* feat: added subject field for more context

- set title for documents

- added list view settings

- refactor suspend and unsuspend functions

- add submit and cancel perms for system and hr managers

- fix tests

* fix: sider issues

* fix: removed suspension and paycut

* fix:sider

* fix: test

* fix: test

* fix: resolved Conflicts

* fix: sider

* fix: remove debugging print statements

* fix: validation message

* fix: unnecessary comma

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-06-23 11:21:38 +05:30
Subin Tom
889140fd8c
fix: sql syntax error in get_project_name method (#26147) 2021-06-22 16:26:19 +05:30
Subin Tom
943b46a759
fix: sql syntax error in get_project_name method (#26145) 2021-06-22 14:26:36 +05:30
Marica
703c30f5f8
fix: Consistent alert indicators 2021-06-22 11:20:17 +05:30
marination
ea0dea46e0 fix: sider and semgrep 2021-06-21 16:51:12 +05:30
marination
49ec0e5ac3 feat: Optionally allow rejected quality inspection on submission 2021-06-21 16:18:35 +05:30
Rohit Waghchaure
01faa9ca11 fix: rate not able to change in purchase order 2021-06-21 14:56:38 +05:30
Rohit Waghchaure
582f187726 fix: rate not able to change in purchase order 2021-06-21 00:59:02 +05:30
Rohit Waghchaure
e5fb23972a fix: available qty for consumption 2021-06-20 15:28:25 +05:30
Rohit Waghchaure
110e152fa3 fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice 2021-06-20 15:28:23 +05:30
Rohit Waghchaure
6bbc8ec3e8 fix: code cleanup and convert public method to private for subcontracting class 2021-06-20 15:27:04 +05:30
Rohit Waghchaure
21b58ef045 fix: semgrep error 2021-06-20 15:27:04 +05:30
Rohit Waghchaure
7b7ceaadd9 feat: subcontract code refactor and enhancement 2021-06-20 15:27:01 +05:30
Rohit Waghchaure
f5db407461 fix: available qty for consumption 2021-06-19 23:19:45 +05:30
Rohit Waghchaure
5cc3f14506 fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice 2021-06-19 23:16:23 +05:30
Rohit Waghchaure
ddb0ec261a fix: code cleanup and convert public method to private for subcontracting class 2021-06-19 23:16:23 +05:30
Rohit Waghchaure
9a2db0b5b1 fix: semgrep error 2021-06-19 23:16:22 +05:30
Rohit Waghchaure
a94b89727c feat: subcontract code refactor and enhancement 2021-06-19 23:16:22 +05:30
rohitwaghchaure
1c846c5be7
Merge pull request #26114 from rohitwaghchaure/fixed-stock-entry-submission-performance-v13-hotfix 
fix: time out while submitting the stock transactions with more than 50 Items
 2021-06-19 18:51:47 +05:30
Rohit Waghchaure
4d81d45a0e fix: time out while submitting the stock transactions with more than 50 items 2021-06-19 16:15:08 +05:30
Rohit Waghchaure
8520edc952 fix: time out while submitting the stock transactions with more than 50 items 2021-06-19 00:55:35 +05:30
Ankush
584fe32900
fix: escaped warehouse value for sql query (bp #26049) 
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-06-18 14:47:30 +05:30
Nabin Hait
0950481253 fix: merge conflict 2021-06-15 20:18:06 +05:30
Noah Jacob
b5a1491176
fix: escaped warehouse value for sql query (#26049) 2021-06-15 12:44:04 +05:30
Deepesh Garg
bbf6121bb5 fix: Revert unintended changes 2021-06-14 20:09:31 +05:30
Deepesh Garg
5ef9a62917 fix: Add separate function to validate payment entry taxes 2021-06-14 20:09:17 +05:30
Deepesh Garg
302855e160 fix: Auto tax calculations in Payment Entry 2021-06-14 20:09:10 +05:30
Deepesh Garg
4cd0f6ce23 fix: Revert unintended changes 2021-06-14 20:01:04 +05:30
Deepesh Garg
8718013c96 fix: Add separate function to validate payment entry taxes 2021-06-14 14:34:44 +05:30
Deepesh Garg
580346360f fix: Auto tax calculations in Payment Entry 2021-06-14 11:16:39 +05:30
Ankush Menat
9891780f5a
perf(minor): remove unnecessary comprehensions (port #25645) 2021-06-11 18:40:22 +05:30
Ankush Menat
a9c84f749a
perf(minor): remove unnecessary comprehensions (#25645) 2021-06-11 16:00:48 +05:30
Rohit Waghchaure
f310501d7d fix: filter type for item query 2021-06-11 10:53:07 +05:30
Nabin Hait
d17217c4e2
Merge pull request #25831 from deepeshgarg007/tds_advance_payment_v13 
feat: Tax deduction against advance payments
 2021-06-10 20:25:30 +05:30
Deepesh Garg
5434dd048b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into dynamic_gst_rates 2021-06-10 18:56:39 +05:30
Deepesh Garg
911818a9e2 fix: Add multiple fixes 2021-06-09 22:55:10 +05:30
Deepesh Garg
6f2dacc60c Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-06 19:31:50 +05:30
Deepesh Garg
18be767f75 fix: Remove invalid test 2021-06-06 13:25:34 +05:30
Deepesh Garg
8a7e283926 feat: Item Taxes based on net rate 2021-06-04 22:53:26 +05:30
rohitwaghchaure
c59371ab0c
fix: filter type for item query (#25942) 2021-06-03 20:02:58 +05:30
Marica
e7d9200e0f
Merge pull request #25221 from Alchez/dev-quality-inspection-accounts 
feat: create Quality Inspections from account and stock documents
 2021-06-03 01:39:05 +05:30
Nabin Hait
811f607c85 Merge branch 'version-13' into develop 2021-06-02 22:14:20 +05:30
Nabin Hait
88d94dbf0a
Merge pull request #25915 from rohitwaghchaure/fixed-work-order-no-able-to-select-item 
fix: not able to select the item code in work order
 2021-06-02 19:00:34 +05:30
Rohan Bansal
a06ec03efc test: add test for new QI function 2021-06-02 14:55:31 +05:30
Rohit Waghchaure
5dd92934ae fix: not able to select the item code in work order 2021-06-02 14:27:24 +05:30
Rohan Bansal
11aff80dea Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts 2021-06-02 14:22:32 +05:30
Rohit Waghchaure
721b4130db fix: not able to select the item code in work order 2021-06-02 14:13:09 +05:30
Nabin Hait
a3d1b6973a fix: merge conflict 2021-05-31 11:21:33 +05:30
Suraj Shetty
c26d41acf9 chore: Remove unnecessary print statements 2021-05-28 09:09:36 +05:30
Rohan Bansal
1e3a3b27c6 style: semgrep issues 2021-05-26 15:18:10 +05:30
Rohan Bansal
1cdf5a0dba fix: add requested changes 2021-05-26 14:42:15 +05:30
Rohan Bansal
c5b074269a Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts 2021-05-26 14:32:14 +05:30
Ganga Manoj
18cfced032
fix(Material Request): Make status on list and form view the same (#24856) 2021-05-25 19:54:07 +05:30
Deepesh Garg
84f270e732 fix: Remove unwanted commits 2021-05-25 18:03:42 +05:30
Deepesh Garg
c9da1fc568 chore: Test case for adance TDS allocation 2021-05-25 17:37:17 +05:30
Deepesh Garg
a23aaf43f4 fix: Allocate advance taxes only for payment entry 2021-05-25 17:36:06 +05:30
Deepesh Garg
d18dde7757 fix: Add tds in PO and code cleanup 2021-05-25 17:32:28 +05:30
Deepesh Garg
c26de28613 fix: TDS against Purhase Orders 2021-05-25 17:25:13 +05:30
Deepesh Garg
61c5e478af feat: Tax deduction against advance payments 2021-05-25 17:20:52 +05:30
Ankush Menat
7b4a38c71e
chore: remove print from account controller (#25807) 
This is polluting test output and it's not useful for debugging without
context.
 2021-05-23 18:49:26 +05:30
rohitwaghchaure
651e934415
Merge pull request #25683 from noahjacob/supplier_item_group_link 
feat: linking supplier with an item group for filtering items
 2021-05-21 12:07:53 +05:30
noahjacob
8e34c49ac9 refactor: using get_all instead of get_list 2021-05-19 13:51:36 +05:30
noahjacob
ca2fb47d44 feat: updates item_code filters if item_group is linked to supplier 2021-05-18 15:01:05 +05:30
Nabin Hait
8b2fef11b1 fix: merge conflict 2021-05-17 11:37:14 +05:30
rohitwaghchaure
2aa401826e
fix: validation message of quality inspection in purchase receipt (#25666) 2021-05-14 12:34:50 +05:30
rohitwaghchaure
e9f6c8cdb1
fix: validation message of quality inspection in purchase receipt (#25667) 2021-05-14 12:34:13 +05:30
rohitwaghchaure
958c96ee3f
Merge pull request #25660 from deepeshgarg007/promotional_item_cost_center 
fix: Breaking cost center validation
 2021-05-11 18:08:17 +05:30
Deepesh Garg
a60c3081cf fix: Breaking cost center validation 2021-05-11 16:38:33 +05:30
Ganga Manoj
f2eb8dd1d5
feat: Transaction Deletion Record (#25354) 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-05-10 14:02:58 +05:30
Suraj Shetty
80aa8a3149 Merge branch 'develop' of github.com:frappe/erpnext into parallel-distributed-testing 2021-05-08 11:28:27 +05:30
Rucha Mahabal
062d30146f
fix: Include search fields in Project Link field query (#25505) 
* fix: Include search fields in Project Link field query

* fix: add project_name to Project search fields
 2021-05-07 13:31:14 +05:30
Suraj Shetty
c702408f99 chore: Remove unnecessary print statements 2021-05-06 18:37:45 +05:30
Saqib
92cefd5655
feat(pos): ability to retry on pos closing failure (#25604) 
* feat(pos): ability to retry on pos closing failure

* fix: sider issues

* fix: sider issues

* fix: mark all queued closing entry as failed

* feat: add headline message
 2021-05-06 17:03:16 +05:30
Saqib
900a8fb21a
feat(pos): ability to retry on pos closing failure (#25595) 
* feat(pos): ability to retry on pos closing failure

* fix: sider issues

* fix: sider issues

* fix: mark all queued closing entry as failed

* feat: add headline message
 2021-05-06 17:02:47 +05:30
18alantom
2a20a03c28 fix: check for None in item.schedule_date before setting 2021-05-05 11:59:15 +05:30
Saqib
2bde1baa38 fix: remove print statement 2021-04-29 18:12:42 +05:30
Saqib Ansari
3a5ecb7587 fix: test 2021-04-29 18:12:32 +05:30
Saqib Ansari
a91eebf6aa feat: base payment amount in payment schedule 2021-04-29 18:12:23 +05:30
Saqib
83e3820575
fix: remove print statement 2021-04-29 12:21:56 +05:30
Saqib Ansari
da5b55c4f5 fix: test 2021-04-28 14:55:33 +05:30
Saqib Ansari
3f7ec95af8 Merge branch 'develop' of https://github.com/frappe/erpnext into payment-term-amount-display-currency-fix 2021-04-28 14:45:27 +05:30
Ankush Menat
9178d95cca
fix: can not create item variants (#25433) 
* fix: item_code assigned to function returning None

* fix: ignore has_variants and attributes in variant

* fix: patch to remove has_variants and attributes

* chore: fix whitespace in translation
 2021-04-26 15:37:17 +05:30
Deepesh Garg
4c8d15b487
fix: Incorrect GL Entry validation (#25474) 
* fix: Incorrect GL Entry validation

* fix: Add validation for party accounts

* fix: Scrub labels

* fix: Translation
 2021-04-26 15:24:34 +05:30
Saqib Ansari
d552fe6778 feat: base payment amount in payment schedule 2021-04-23 14:46:52 +05:30
Deepesh Garg
cb718fce88
feat: Role to allow over billing, delivery, receipt (#24854) 
* feat: Role to allow  over billing, delivery, receipt

* fix: Typo
 2021-04-19 13:25:15 +05:30
Ankush Menat
7eac4a250d
fix: functions using mutable defaults (#25370) 2021-04-19 10:33:39 +05:30
Ankush Menat
ad6a2657ae
chore: minor translation fixes 2021-04-17 16:56:09 +05:30
Ankush Menat
dedf2c1b61
fix: remove duplicate keys from dictionaries 2021-04-17 16:56:08 +05:30
Marica
4e25aa77dd
Merge branch 'develop' into dev-quality-inspection-accounts 2021-04-14 19:06:14 +05:30
rohitwaghchaure
ac6facda3d
Merge pull request #25186 from rohitwaghchaure/fixed-incorrect-batch-selected-in-purchase-rceipt-develop 
fix: incorrect batch picked in subcontracted purchase receipt
 2021-04-14 14:35:12 +05:30
Rohan Bansal
7f8b95efe8 fix: move QI logic to stock module 2021-04-14 14:15:45 +05:30
Nabin Hait
2535fe9b1e fix: Resolved merge conflict 2021-04-14 13:09:50 +05:30
Nabin Hait
f7441c4c0a
Merge branch 'develop' into fixed-incorrect-batch-selected-in-purchase-rceipt-develop 2021-04-14 11:23:00 +05:30
Deepesh Garg
e2dc102bc6
fix: Zero amount completed delivery notes being shown in Sales Invocie get items (#25317) 2021-04-14 11:21:11 +05:30
Deepesh Garg
b67058869a
fix: Round off final tax amount instead of current tax amount (#25188) 
* fix: Round off final tax amount instead of current tax amount

* fix: Syntax error

* fix: Indentation

* fix: Round Off taxes order execution

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-04-14 11:20:27 +05:30
rohitwaghchaure
ce6c3b5b74
fix: incorrect incoming rate for the sales return (#25306) 2021-04-13 20:55:52 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
Deepesh Garg
5f3d7f547c
fix: Item wise tax rate for consolidated POS invoice (#25029) 
* fix: Item wise tax rate for consolidated POS invoice

* fix: Do not alter item wise taxes for consolidated invoices

* fix: Add test case

* fix: Update

* fix: Set opening stock for test item

* fix: Add valuation rate for opening stock
 2021-04-12 10:56:47 +05:30
Rohit Waghchaure
1358443cdb fix: patch 2021-04-10 10:42:08 +05:30
Deepesh Garg
df9388aa8e
Merge pull request #25086 from deepeshgarg007/advance_amount_precision 
fix: Precision issues while allocating advance amount
 2021-04-09 21:39:02 +05:30
Rohan Bansal
a93b514b2f feat: create Quality Inspections from account and stock documents 2021-04-06 17:20:16 +05:30
Rohit Waghchaure
8b829711fc fix: incorrect batch picked in subcontracted purchase receipt 2021-04-04 12:43:38 +05:30
Walstan Baptista
37b826b988
fix: correct calculation for discount amount when margin is set (#25179) 2021-04-03 19:48:46 +05:30
Nabin Hait
11eb30d082 fix: merge conflict 2021-04-01 15:03:11 +05:30
Marica
8617c0ab99
Merge pull request #25070 from marination/update-items-bin 
fix: Update Bin via Update Item on Purchase/Sales Order
 2021-03-31 22:21:41 +05:30
Anupam Kumar
526497bc43
Merge pull request #25104 from anupamvs/purchase-side-margin-beta 
feat: price margin in buying
 2021-03-31 18:38:58 +05:30
Anupam
ad520e08ba feat: price margin in buying 2021-03-31 18:31:12 +05:30
Marica
1b8d36634f
Merge branch 'develop' into patch-7 2021-03-31 16:04:24 +05:30
Saqib
fb4051bddd
feat: discount configuration on early payments (#25089) 
* feat: discount configuration on early payments

Co-authored-by: Nabin Hait <nabinhait@gmail.com>

* fix: remove duplicate patch call

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-03-31 15:52:51 +05:30
Saqib
0586b7db79
feat: discount configuration on early payments (#24586) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-03-31 15:03:53 +05:30
Deepesh Garg
f54d596ae1 fix: Precision issues while allocating advance amoount 2021-03-31 14:06:02 +05:30
Sagar Vora
e50324aed7
perf: reduce number of queries for checking if future SL entry exists (#25064) 2021-03-31 12:44:03 +05:30
Walstan Baptista
d6360755b9
chore: frappe.whitelist for doc methods (#25068) 
* chore: frappe.whitelist for doc methods

* fix: incorrect spelling

* fix: sider issue

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-03-31 12:30:32 +05:30
marination
a5de6c779b fix: Cleaned up and fixed validation and bin updation on deletion 
- Created separate smaller functions for validation and bin updation of deleted row
- Made sure previous doc (linked doc) was also updated after deletion of row
- Tests to check bin updation on add/update/delete
- Made reserved qty for subcontrating read only in bin
 2021-03-31 02:03:26 +05:30
Andy Zhu
ba3578929e Update accounts_controller.py 
Updating Bin quantity based on doctype to optimize running efficiency.
 2021-03-31 02:03:16 +05:30
Andy Zhu
c0ba6eafd5 fix: Update Items on Purchase Order 
1. set warehouse using `get_item_warehouse`
2. update "reserved_qty" for sales order
 2021-03-31 02:03:10 +05:30
Andy Zhu
a21e347bf1 fix: Update Items on Purchase Order 
If user add rows or remove rows to update items on purchase order, the quantity in bin won't get updated.
This fix is not mature yet but to give an tempopary solution for fixing this issue.
 2021-03-31 02:03:02 +05:30
marination
0673f558c1 fix: Cleaned up and fixed validation and bin updation on deletion 
- Created separate smaller functions for validation and bin updation of deleted row
- Made sure previous doc (linked doc) was also updated after deletion of row
- Tests to check bin updation on add/update/delete
- Made reserved qty for subcontrating read only in bin
 2021-03-31 01:42:18 +05:30
Marica
c5739957de
Merge branch 'develop' into patch-7 2021-03-30 18:07:32 +05:30
Deepesh Garg
6be78db62c
Merge pull request #25052 from deepeshgarg007/gst_rounding_v13_beta 
feat: Normal rounding for GST Taxes
 2021-03-30 17:01:45 +05:30
Anupam Kumar
9be11afbde
feat: price margin in buying (#25058) 2021-03-30 12:09:46 +05:30
Deepesh Garg
c2548ddc75 feat: Normal rounding for GST Taxes 2021-03-29 16:42:47 +05:30
rohitwaghchaure
b38ea0cc8b
fix: patch (#25014) 
* fix: patch

* fix: pricing_rule test cases
 2021-03-28 15:51:32 +05:30
Sagar Vora
868c0bf45b
perf: reduce no of queries for checking if future sl entry exists (#24881) 2021-03-27 16:10:20 +05:30
rohitwaghchaure
d5759bab11
Merge pull request #24922 from rohitwaghchaure/feat-recursice-pricing-rule 
feat: recursive pricing rule
 2021-03-26 19:10:10 +05:30
Rohit Waghchaure
256b9c7bf9 fix: total weight not set for free items 2021-03-26 19:05:46 +05:30
Rohit Waghchaure
cd8422a840 feat: recursive product discount 2021-03-26 19:05:43 +05:30
Deepesh Garg
1a6e6320cf Revert "fix: validating party currency with doc currency (#24318)" 
This reverts commit 02142c41bb.
 2021-03-24 21:26:04 +05:30
Afshan
02142c41bb
fix: validating party currency with doc currency (#24318) 
* fix: validating supplier currency

* fix: compare current currency with company currency as well.

* fix: replaced or with add in condition

* fix: conditioning to get proper payment terms values

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-03-23 20:53:56 +05:30
Rohit Waghchaure
bde159a77d fix: total weight not set for free items 2021-03-22 23:36:48 +05:30
Deepesh Garg
b75cbeee4d fix: Allow user to update exchange rate in Multi-currency LCV 2021-03-18 21:20:44 +05:30
Deepesh Garg
9b0a9cc2c0
Merge pull request #24912 from deepeshgarg007/multi_currency_lcv_issues 
fix: Allow user to update exchange rate in Multi-currency LCV
 2021-03-18 21:20:06 +05:30
Sagar Vora
f4a6c7823a
test: create new item instead of using _Test Item to prevent error (#24915) 2021-03-17 19:57:53 +05:30
Rohit Waghchaure
ff70e61d7a feat: recursive product discount 2021-03-17 14:30:34 +05:30
Deepesh Garg
22f5ff8492 fix: Allow user to update exchange rate in Multi-currency LCV 2021-03-17 10:56:52 +05:30
Anupam Kumar
ed42afc5e8
feat: price margin in buying (#24685) 2021-03-15 11:11:28 +05:30
Nabin Hait
fe3529b194 fix: merge conflict 2021-03-11 16:45:41 +05:30
Anupam Kumar
77eaf2939a
fix: rate of stock uom division by zero error (#24829) 2021-03-10 12:04:54 +05:30
Afshan
0623a34210
fix: added supplier warehouse field back again (#24827) 2021-03-10 09:46:38 +05:30
Afshan
27bcb2a064
fix: renamed "supplier_warehouse" to "set_from_warehouse" (#24816) 
* fix: reverting and adding new field for supplier warehouse
 2021-03-09 22:25:48 +05:30
Anuja Pawar
8755339cba
fix: to update sales person's incentives on save (#24179) 2021-03-01 10:44:13 +05:30
Nabin Hait
d46b23699c
fix: optimize reposting of gle and sle (#24702) 
* fix(india): escape for special characters in JSON (#24695)

JSON does not accept special whitespace characters like tab, carriage
return, line feed

Ref: https://www.ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf

Related issue: ISS-20-21-09811

* fix: Accounting Dimension creation background job timeout

* fix(regional): vehicle no is mandatory for ewaybill generation (#24679)

* fix: vehicle no required for e-invoice

* fix: ewaybill generation dialog condition

* fix: excluding unidentified accounts from gstr-1

* fix: optimize reposting of sle and gle (#24694)

* fix: optimize update_gl_entries_after method

* fix: Optimized reposting patch

* fix: accounting dimensions

* added reload_doc in patch

* Update item_reposting_for_incorrect_sl_and_gl.py

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>

* fix: Replaced spaces with tabs

* fix: merge conflict

* fix: test cases

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2021-02-23 16:38:52 +05:30
Nabin Hait
19f8fa59d3
fix: optimize reposting of sle and gle (#24694) 
* fix: optimize update_gl_entries_after method

* fix: Optimized reposting patch

* fix: accounting dimensions

* added reload_doc in patch

* Update item_reposting_for_incorrect_sl_and_gl.py

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2021-02-22 22:27:22 +05:30
Deepesh Garg
6a5ef261f2
feat: Normal rounding for GST Taxes (#24488) 
* feat: Normal rounding for GST Taxes

* fix: Add test case

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-19 14:30:23 +05:30
Anupam Kumar
b1997da488 feat: capture Rate of stock UOM in purchase (#24315) 
* feat: capture Rate of stock UOM in purchase

* fix: review changes

* added server side code

* added stock uom rate in sales transactions

* fix: review changes

* fix: resolving conflicts

* adding patch

* fix: removing patch
 2021-02-18 21:32:05 +05:30
Nabin Hait
deddcc513d fix: stock and account balance syncing (#24644) 
* fix: stock and account balance syncing

* fix: stock and account balance syncing

* fix: stock and account balance syncing

* fix: minor fix
 2021-02-18 21:28:16 +05:30
Ankush Menat
4b2cbdc2dd fix: update total in words after updating items (#24602) 
* fix: Update total in words after Updating items

Update total in words after Updating items in sales/purchase orders.
Port of #24592

Closes ISS-20-21-09425

* test: Add test for total & words after update item

Add test for total & words after updating items in sales order.
 2021-02-18 21:25:00 +05:30
Saqib
90ff48baa3 refactor: POS Invoice merging and cancellation (#24351) 
* feat: pos invoice merging with background jobs

* fix: invoice threshold for queueing job

* refactor: cancellation flow of point of sale

* feat: tests for cancellation of pos closing

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-02-18 21:00:34 +05:30
Saqib
a439d19917 feat(pos): mpesa related fixes & additions (#24306) 
* fix: switching of mode of payments

* feat: transaction limit for mpesa integration

* feat: resend payment request if one fails

* feat: make new request only for failed ones

* fix: invalid amount for mpesa request

* fix: payment successful message not shown

* fix: url and business shortcode for live env

* fix: duplicate items validation for pos invoices

* fix: pos closing entry queued status

* fix: peroid end date for amended pos closing
 2021-02-18 20:53:26 +05:30
Rucha Mahabal
e7bf87cc84
fix: POS return for Serialized Items (#24292) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-02-18 16:04:35 +05:30