Rucha Mahabal
88929b055c
fix: precision for expected values in payment entry test
2021-07-08 19:27:53 +05:30
Rucha Mahabal
06fc9e7847
fix: sibling group expansion not working for root nodes
2021-07-08 18:44:53 +05:30
Alan
257cbd3b92
fix: track changes on batch ( #26382 )
2021-07-08 18:44:30 +05:30
Anurag Mishra
a82e9e42e1
fix: query for training Event
2021-07-08 17:27:21 +05:30
Anurag Mishra
b6ff8917e8
fix: query for training Event
2021-07-08 17:25:37 +05:30
Rucha Mahabal
09c24c7949
fix: exclude active node while fetching sibling group
2021-07-08 17:05:40 +05:30
Rucha Mahabal
05ffc0d3e0
feat: use icon for connections on mobile view
2021-07-08 16:55:42 +05:30
Rucha Mahabal
a4132d7ec6
Merge branch 'develop' into fix-sla-test
2021-07-08 16:20:11 +05:30
Rucha Mahabal
091f41e986
fix: yet another fix for flaky SLA Test
2021-07-08 14:57:54 +05:30
Jannat Patel
42214999a6
Merge branch 'develop' into salary-slip-fix--develop
2021-07-08 13:44:12 +05:30
Jannat Patel
cf28950327
Merge pull request #26349 from Anurag810/salary-slip-fix--hotfix
...
fix: payroll-entry minor fix
2021-07-08 13:43:55 +05:30
Anurag Mishra
8f945a9852
fix: Removed un-used flag
2021-07-08 13:06:04 +05:30
Anurag Mishra
fac420ee09
fix: Removed un-used flag
2021-07-08 13:05:14 +05:30
Rucha Mahabal
48018b8d8c
fix: do not sort by number of connections
2021-07-08 11:23:50 +05:30
Saqib
eaef371585
fix: escape quotes while fetching customer emails ( #26329 )
2021-07-08 10:52:41 +05:30
Rucha Mahabal
df3bb9ea8c
perf: Optimise Rendering
...
- optimise get_children function
- use promises instead of callbacks
- optimise selectors
- use const wherever possible
- use pure js instead of jquery for connectors for faster rendering
2021-07-08 09:53:31 +05:30
GangaManoj
cfff3b8726
fix: Test GL Entries made when an Asset is returned
2021-07-07 21:04:20 +05:30
GangaManoj
298b43c177
fix: Let create_item() make items that are fixed assets
2021-07-07 20:56:15 +05:30
Mohammad Hasnain Mohsin Rajan
00f90c50c0
chore: add product listing link in settings ( #26026 )
...
* chore: add product listing link in settings
* chore: add icon in workspace card
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-07-07 18:21:12 +05:30
GangaManoj
3a7f25b218
fix: Make functions more readable
2021-07-07 15:59:52 +05:30
Saqib
9910968398
Merge branch 'develop' into enable-discount-accounting
2021-07-07 12:56:11 +05:30
Saqib
0b320b5909
Merge pull request #25798 from GangaManoj/asset-repair-refactor
...
refactor: Asset Repair
2021-07-07 12:44:50 +05:30
Mohammad Hasnain Mohsin Rajan
290350c86f
chore: add product listing link in settings ( #26026 )
...
* chore: add product listing link in settings
* chore: add icon in workspace card
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-07-07 12:10:02 +05:30
Rucha Mahabal
6eec251273
feat: handle multiple root / orphan nodes
2021-07-07 12:05:50 +05:30
Noah Jacob
a01264dae7
fix: stock_rbnb not defined ( #26354 )
2021-07-07 11:07:19 +05:30
Rucha Mahabal
6d5ee25bba
fix: unnecessary variables
2021-07-07 09:43:28 +05:30
rohitwaghchaure
f130f8385e
Merge pull request #26332 from rohitwaghchaure/fixed-bom-stock-report-not-working
...
fix: bom stock report not working
2021-07-07 00:22:03 +05:30
Rohit Waghchaure
dd1b2995a8
fix: stock entry with putaway rule not working
2021-07-07 00:16:35 +05:30
rohitwaghchaure
2bdc0e8993
Merge pull request #26350 from rohitwaghchaure/fixed-putaway-fixing-for-material-receipt
...
fix: stock entry with putaway rule not working
2021-07-07 00:15:26 +05:30
Rohit Waghchaure
0bd190b885
fix: stock entry with putaway rule not working
2021-07-07 00:14:51 +05:30
GangaManoj
ca87745be1
fix: Rename get_gl_entries_on_asset_movement to get_gl_entries_on_asset_disposal_and_regain
2021-07-06 23:43:08 +05:30
Nabin Hait
d45ebaf61c
Merge pull request #26347 from ruchamahabal/fix-flaky-sla-test
...
fix: flaky SLA test
2021-07-06 21:50:42 +05:30
Nabin Hait
11d56903e7
Merge pull request #25415 from deepeshgarg007/bootstraped_gst_setup
...
feat(India): Bootstrapped GST Setup
2021-07-06 21:44:30 +05:30
Deepesh Garg
bd40669dab
Merge pull request #26289 from nemesis189/fixed-budget-variance-report-color
...
fix: Fixed Budget Variance Graph color from all black to default
2021-07-06 20:36:00 +05:30
Deepesh Garg
67c7067778
Merge pull request #26300 from AfshanKhan/fix-account-selection-gst-settings-v13
...
fix: only "Tax" type accounts should be shown for selection in GST Settings
2021-07-06 20:33:41 +05:30
GangaManoj
3ea4f993b7
feat: Toggle display for discount accounting fields according to enable_discount_accounting
2021-07-06 20:22:13 +05:30
Afshan
4ba680a65e
Merge branch 'develop' into fix-account-selection-gst-settings
2021-07-06 19:52:12 +05:30
Saqib
422325bb74
test: fetching of previous sle ( #26352 )
2021-07-06 18:37:12 +05:30
Deepesh Garg
3636efd7e6
Merge pull request #26355 from deepeshgarg007/flaky_test
...
test: Purchase Invoice advance test case
2021-07-06 18:22:26 +05:30
Rucha Mahabal
ad06603392
fix: removing orphaned connectors
2021-07-06 18:16:49 +05:30
Saqib
f9e9d86955
test: fetching of previous sle ( #26352 )
2021-07-06 18:09:21 +05:30
Noah Jacob
5e99aa7f65
fix: stock_rbnb not defined ( #26354 )
2021-07-06 18:00:35 +05:30
Deepesh Garg
7f794cc0ea
fix: Purchase Invoice advance test case
2021-07-06 17:58:44 +05:30
Deepesh Garg
a62f94379b
Merge pull request #26324 from deepeshgarg007/bank_statement_import_fix_develop
...
fix: Bank statement import
2021-07-06 17:25:21 +05:30
Afshan
11e0ed5f6e
Merge branch 'develop' into fix-account-selection-gst-settings
2021-07-06 17:21:19 +05:30
GangaManoj
657e9b5320
feat: Assign Item's Default Discount Account if present
2021-07-06 16:51:12 +05:30
Rucha Mahabal
e7fceb556d
Merge branch 'develop' into fix-flaky-sla-test
2021-07-06 16:38:46 +05:30
GangaManoj
ef667a9a64
feat: Add Default Discount Account field
2021-07-06 16:29:19 +05:30
GangaManoj
b08bb1f1a2
feat: Filter list for Discount Account field in Items table
2021-07-06 16:28:19 +05:30
Deepesh Garg
2f3f87dc66
Merge branch 'develop' into multi-company-deferred-revenue_develop
2021-07-06 16:14:25 +05:30
Deepesh Garg
26dc02aa38
Merge branch 'develop' into bank_statement_import_fix_develop
2021-07-06 16:14:13 +05:30
Deepesh Garg
381c05eb87
Merge pull request #26322 from deepeshgarg007/party_dashboard_develop
...
fix: Do not consider cancelled entries in party dashboard
2021-07-06 16:13:49 +05:30
Noah Jacob
0734901a89
fix: stock_rbnb not defined ( #26345 )
2021-07-06 15:56:10 +05:30
Deepesh Garg
8985231a96
fix: Rewrite tests
2021-07-06 15:34:47 +05:30
Afshan
a63796e6f0
Merge branch 'develop' into fix-account-selection-gst-settings
2021-07-06 14:38:26 +05:30
Afshan
c8eca8a448
fix: remove cancelled entries in consolidated financial statements ( #26331 )
2021-07-06 14:37:57 +05:30
Afshan
53e3435770
fix: remove cancelled entries in consolidated financial statements ( #26330 )
2021-07-06 14:37:21 +05:30
Anurag Mishra
f0b62f70d5
fix: payroll-entry minor fix
2021-07-06 13:40:22 +05:30
Anurag Mishra
1f5e2ba8e7
fix: payroll-entry minor fix
2021-07-06 13:36:23 +05:30
Mohammed Yusuf Shaikh
842674ce79
fix: Added a message to enable appontment booking if disabled ( #26334 )
2021-07-06 13:34:32 +05:30
Rucha Mahabal
f67c95d32f
fix: flaky SLA test
2021-07-06 13:27:48 +05:30
Marica
dfe11aca6a
Merge pull request #26284 from marination/order-by-weightage-for-web-items
...
fix: Order Items by weightage in the web items query
2021-07-06 13:20:08 +05:30
Afshan
d10c016a0b
Merge branch 'develop' into fix-account-selection-gst-settings
2021-07-06 11:56:39 +05:30
Deepesh Garg
96eb3be6df
fix: Debug Tests
2021-07-06 11:21:44 +05:30
Deepesh Garg
66c04ca984
fix: Debug tests
2021-07-06 10:56:42 +05:30
GangaManoj
cf7579e29f
feat: Create GL Entries for discount accounting
2021-07-06 00:36:06 +05:30
Deepesh Garg
32436eceda
fix: Debug tests
2021-07-05 23:34:09 +05:30
Deepesh Garg
c21d3d4865
fix: Debug tests
2021-07-05 22:47:59 +05:30
marination
44c1e8da06
chore: Test to block backdated reco causing future scarcity
2021-07-05 21:59:28 +05:30
marination
e8c9ab4b01
chore: Test for backdated reco qty reposting
2021-07-05 21:59:14 +05:30
marination
8c441263f8
fix: Sider
2021-07-05 21:59:04 +05:30
marination
4038977e2e
fix: Handle Stock Reco cancellation and limit reposting
...
- Handled cancellation of reco with and without prior SLE
- Repost / Recalculate balance qty only till next stock reco
2021-07-05 21:58:57 +05:30
marination
8418c4bfe0
fix: Include Stock Reco logic in update_qty_in_future_sle
2021-07-05 21:58:50 +05:30
marination
57d06a86f8
chore: Test to block backdated reco causing future scarcity
2021-07-05 21:56:57 +05:30
Deepesh Garg
8c1b764a90
fix: Debug tests
2021-07-05 21:49:10 +05:30
Afshan
668da102c9
Merge branch 'develop' into fix-account-selection-gst-settings
2021-07-05 21:35:23 +05:30
Marica
4f51b56928
Merge branch 'version-13-hotfix' into stock-reco-repost_qty
2021-07-05 20:26:01 +05:30
marination
fa9e67502c
chore: Test for backdated reco qty reposting
2021-07-05 20:23:00 +05:30
Deepesh Garg
9b6d9a41f4
fix: Test Cases
2021-07-05 17:08:27 +05:30
GangaManoj
6e0d83d925
feat(Sales Invoice): Add 'Discount Account' field in Items table
2021-07-05 15:09:05 +05:30
GangaManoj
be15e16b84
feat(Accounts Settings): Add 'Enable Discount Accounting' checkbox
2021-07-05 14:58:32 +05:30
Deepesh Garg
15b336df28
fix: Test cases
2021-07-05 14:45:33 +05:30
marination
c69bc54297
fix: Validate LCV for Invoices without Update Stock
2021-07-05 14:24:38 +05:30
Rohit Waghchaure
5638fbb1aa
fix: bom stock report not working
2021-07-05 13:54:05 +05:30
Deepesh Garg
db682d9e4c
fix: Create mode of payment if doesn't exists
2021-07-05 13:46:03 +05:30
Ankush Menat
03f7bf6589
test: variant BOM from template BOM
2021-07-05 12:26:14 +05:30
Richard Case
046e83bf50
fix: incorrect bom no. added for non-variant items on variant boms ( #26320 )
2021-07-05 12:26:14 +05:30
Richard Case
75fdf79376
fix: incorrect bom no. added for non-variant items on variant boms ( #26320 )
2021-07-05 10:56:34 +05:30
Deepesh Garg
a0599e5ac2
fix: Test cases for M-pesa
2021-07-05 10:09:42 +05:30
rohitwaghchaure
22c2d4f118
Merge pull request #26312 from rohitwaghchaure/fixed-employee-issue-in-job-card
...
fix: allow to make job card without employee
2021-07-04 22:58:50 +05:30
Deepesh Garg
ddf87594a1
Merge pull request #26287 from deepeshgarg007/bank_statement_import_fix
...
fix: Bank statement import
2021-07-04 20:34:10 +05:30
Deepesh Garg
9d295ca939
fix: Bank statement import
2021-07-04 20:33:36 +05:30
Deepesh Garg
ea5b7d38bb
Merge pull request #26277 from deepeshgarg007/multi-company-deferred-revenue
...
fix: Auto process deferred accounting for multi-company setup
2021-07-04 20:32:22 +05:30
Deepesh Garg
5069095984
fix: Auto process deferred accounting for multi-company setup
2021-07-04 20:31:37 +05:30
Deepesh Garg
cd036e115b
Merge pull request #26231 from deepeshgarg007/party_dashboard
...
fix: Do not consider cancelled entries in party dashboard
2021-07-04 20:30:34 +05:30
Deepesh Garg
802e63a9d7
fix: Do not consider cancelled entries in party dashboard
2021-07-04 20:29:41 +05:30
Rohit Waghchaure
3105332e3c
fix: allow to make job card without employee
2021-07-03 17:25:08 +05:30
Noah Jacob
8db974b1b9
test: updated test cases
2021-07-02 22:00:33 +05:30
Deepesh Garg
63096014a7
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup
2021-07-02 20:30:18 +05:30
Afshan
d06a95b6fa
Merge branch 'develop' into fix-account-selection-gst-settings
2021-07-02 19:32:12 +05:30
Rucha Mahabal
2fcd05aa82
fix: sider
2021-07-02 18:15:18 +05:30
marination
311e277204
fix: Sider
2021-07-02 18:11:13 +05:30
Anurag Mishra
73db919c99
fix: set query for training events ( #26303 )
...
* fix: set query
* fix: remove whitespace between function and params
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-07-02 17:55:42 +05:30
Anurag Mishra
0a79cfa170
fix: set query for training events ( #26302 )
...
* fix: set query
* fix: whitespace between function name and param
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-07-02 17:54:43 +05:30
marination
4503a38361
fix: Handle Stock Reco cancellation and limit reposting
...
- Handled cancellation of reco with and without prior SLE
- Repost / Recalculate balance qty only till next stock reco
2021-07-02 17:13:45 +05:30
GangaManoj
f8ee8058e7
fix(Sales Invoice): Reset disposal_date on returning the Asset
2021-07-02 15:45:52 +05:30
Afshan
b6076f772d
fix: only "Tax" type accounts should be shown for selection in GST Settings
2021-07-02 15:39:16 +05:30
Afshan
20f73d4c58
fix: only "Tax" type accounts should be shown for selection in GST Settings
2021-07-02 15:34:26 +05:30
GangaManoj
4cf3d9ac20
fix(Sales Invoice): Let invoice be created for Sold Assets if it's a return invoice
2021-07-02 15:25:04 +05:30
Ashish Shah
c0817838d9
fix: when lead is created with mobile_no, mobile_no value gets lost ( #26298 )
...
Summary: When a Lead is created with mobile_no, mobile_no value gets lost (mobile_no value is overwritten by phone value)
It is backport of https://github.com/frappe/erpnext/pull/26116
Steps to reproduce
[1]Create a Lead.
[2]Enter
Person Name(lead_name): before_fix
Under Contact section,
enter Phone(phone): 11 and
Mobile No.(mobile_no):22
[3]Save it
[4] F12,
cur_frm.doc.phone : 11 (correct)
cur_frm.doc.mobile_no : 11 (incorrect, it should be 22)
[5]Under Address & Contact section ,check contact_html it shows
before_fix
Phone: 11 (Primary label is missing)
Phone: 22 (incorrect, it should be Mobile No:22, also Primary label is missing)
Actual:
mobile_no value is lost. it is overwritten by phone value
following is image with error (before fix)
Expected:
mobile_no value should be retained
following is image after fix
2021-07-02 15:16:42 +05:30
Ashish Shah
4e6805b04e
fix: When Lead is created with mobile_no, mobile_no value gets lost (it is overwritten by phon value) ( #26116 )
...
Steps to reproduce
[1]Create a Lead.
[2]Enter Person Name(lead_name): XX
under Contact section, enter Phone(phone): 11 and Mobile No.(mobile_no):22
[3]Save it
[4] F12,
cur_frm.doc.phone : 11 (correct)
cur_frm.doc.mobile_no : 11 (incorrect)
[5]Under Address & Contact section ,check contact_html it shows
ty
Phone: 22 (correct)
Phone: 11 (in correct)
Actual:
mobile_no value is lost. it is overwritten by phone value
Expected:
mobile_no value should be retained
2021-07-02 13:35:04 +05:30
Anupam Kumar
877597bc16
fix: feating employee in payroll entry ( #26271 )
2021-07-02 13:10:18 +05:30
Jannat Patel
0a15a03522
fix: lms progress issue ( #26250 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-07-02 13:06:56 +05:30
Jannat Patel
18533e381a
fix: lms progress issue ( #26253 )
2021-07-02 12:57:06 +05:30
Mohammed Yusuf Shaikh
ad6f20c5c7
fix: Added permission for employee to book appointment ( #26255 )
2021-07-02 12:32:22 +05:30
Mohammed Yusuf Shaikh
6c2f66b0a4
fix: Added permission for employee to book appointment ( #26266 )
2021-07-02 12:21:44 +05:30
Mohammed Yusuf Shaikh
86f41839fe
fix: Added a message to enable appointment booking if disabled ( #26233 )
...
* fix: Added a message to enable appointment booking if disabled
* refactor: added translation for the message
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
* fix: added missing import
* fix: minor identation and space fix
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-07-02 12:19:24 +05:30
Jannat Patel
5173e74a04
fix: Project Portal Enhancements ( #26290 )
...
* fix: project portal enhancements
* fix: condition for pills
2021-07-02 11:48:46 +05:30
Saqib
f9c58934d8
Merge branch 'develop' into asset-repair-refactor
2021-07-02 11:19:47 +05:30
Ankush
8ebf32e18f
fix: undo changes to issue.py ( #26291 )
...
The fix ported from v13 to develop is not valid because of the new generic SLA feature.
Hard resetting the file to the previous version.
ec25d5938b
2021-07-02 11:09:19 +05:30
Deepesh Garg
d4146a91d6
Merge pull request #25323 from m1ngaa/patch-1
...
Delete accounts (an empty file)
2021-07-01 23:38:56 +05:30
Deepesh Garg
991d3cdd76
fix: Incorrect discount amount on amended document
2021-07-01 21:17:17 +05:30
Subin Tom
d2c86bb9d7
fix: Fixed Budget Variance Graph color from all black to default
2021-07-01 19:59:08 +05:30
Saqib
49ef26075a
Merge branch 'develop' into asset-repair-refactor
2021-07-01 19:27:20 +05:30
Deepesh Garg
ba2c3c776f
fix: Bank statement import
2021-07-01 18:56:51 +05:30
Dany Robert
4e96563c92
Merge branch 'develop' into patch-5
2021-07-01 18:56:43 +05:30
Deepesh Garg
8a5c7ea9b4
Merge branch 'develop' into patch-4
2021-07-01 18:08:22 +05:30
marination
752f099e9d
fix: Order Items by weightage in the web items query
2021-07-01 17:20:24 +05:30
Jannat Patel
5a4251107c
feat: Project Portal Enhancements ( #26090 )
...
* fix: project portal enhancements
* fix: timesheet table and task nesting
* fix: semgrep and link issue
* fix: sider
* fix: project details view title
* fix: project progress pills
* fix: website route rule for project
* fix: multi level nesting
* fix: added subject and indentation
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-07-01 17:17:34 +05:30
18alantom
865900fd2d
refactor: add type hints, remove comment, sort imports
2021-07-01 14:37:37 +05:30
Anuja Pawar
d8bc514226
fix: to fetch the correct field in Tax Rule ( #25927 )
2021-07-01 14:06:01 +05:30
Nabin Hait
07a74abcc3
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2021-07-01 12:55:13 +05:30
Nabin Hait
fa006402b8
fix: merge conflict
2021-07-01 12:47:28 +05:30
Ankush
d45e307f02
test: fix expected test failure ( #26275 )
...
reference: https://github.com/frappe/frappe/pull/13557
2021-07-01 12:38:09 +05:30
Nabin Hait
eee03fcbab
bumped to version 13.6.0
2021-07-01 12:57:13 +05:50
rohitwaghchaure
117cf4eca6
Merge pull request #26278 from rohitwaghchaure/fixed-employee-selection-issue-in-payroll-entry
...
fix: employee selection not working in payroll entry
2021-07-01 12:31:45 +05:30
Nabin Hait
d7c4818a5d
Merge pull request #26281 from rohitwaghchaure/fixed-update-cost-not-working-for-draft-bom-pre
...
fix: update cost not working in the draft BOM
2021-07-01 12:30:55 +05:30
Rohit Waghchaure
f99f872946
fix: update cost not working in the draft bom
2021-07-01 12:02:37 +05:30
Rohit Waghchaure
87b4e6ea32
fix: employee selection not working in payroll entry
2021-07-01 12:02:03 +05:30
rohitwaghchaure
c14fc9530c
Merge pull request #26279 from rohitwaghchaure/fixed-update-cost-not-working-for-draft-bom
...
fix: update cost not working in the draft BOM
2021-07-01 11:57:32 +05:30
Rohit Waghchaure
a856624ccb
fix: employee selection not working in payroll entry
2021-07-01 11:56:55 +05:30
Rohit Waghchaure
0bfd56e615
fix: update cost not working in the draft bom
2021-07-01 11:50:48 +05:30
Deepesh Garg
68c697b354
fix: Auto process deferred accounting for multi-company setup
2021-07-01 09:31:31 +05:30
Dany Robert
4023ed8356
Merge branch 'develop' into patch-5
2021-06-30 22:43:00 +05:30
Nabin Hait
cf4e29a604
chore: Added change log for v13.6.0
2021-06-30 20:27:43 +05:30
Deepesh Garg
970d90f3b2
Merge pull request #25970 from GangaManoj/exchange-rate-difference-handling
...
feat: Exchange rate difference handling in procurement cycle
2021-06-30 20:25:39 +05:30
Anupam
03f7609a8b
fix: moving campaign from selling to CRM
2021-06-30 18:18:03 +05:30
Anupam
8492bf040d
fix: feating employee in payroll entry
2021-06-30 17:17:43 +05:30
Deepesh Garg
cf7af62b05
fix: Code cleanup
2021-06-30 14:14:32 +05:30
Rohit Waghchaure
815e6ec846
fix: minor removed unused file
2021-06-30 11:35:50 +05:30
rohitwaghchaure
2a1d1e1cb1
Merge pull request #26240 from rohitwaghchaure/production-plan-sub-assembly-enhancement
...
feat: provision to make subcontracted purchase order from the production plan
2021-06-30 11:15:11 +05:30
Rucha Mahabal
77b0b8a877
fix: edit node button overflowing
2021-06-30 02:29:16 +05:30
Rucha Mahabal
b8a18bfef1
feat: add arc to connectors in mobile view
2021-06-30 01:57:43 +05:30
Rucha Mahabal
a7507f7af6
refactor: use arcs instead of bezier curves for cleaner connectors
2021-06-30 01:46:10 +05:30
Rohit Waghchaure
46b67b901b
fix: incorrect valuation rate in stock reconciliation
2021-06-30 00:31:00 +05:30
Rucha Mahabal
7558b28b79
fix: revert changes in employee descendants query
2021-06-29 21:57:27 +05:30
Rucha Mahabal
c40b9d276e
feat: setup node edit action
2021-06-29 21:51:21 +05:30
Rucha Mahabal
f15e8b7f5a
refactor: add options to chart
...
- method to return the node data
- wrapper for showing the hierarchy
2021-06-29 21:26:47 +05:30
Deepesh Garg
a287b22b55
Merge pull request #26252 from deepeshgarg007/loan_security_pledge_on_cancel
...
fix: Cancellation of Loan Security Pledges
2021-06-29 20:23:46 +05:30
Rohit Waghchaure
61690775a8
feat: provision to make subcontracted purchase order from the production plan
2021-06-29 19:59:20 +05:30
Rucha Mahabal
bcc998e8c2
chore: create separate files for Desktop and Mobile view and bundle assets
2021-06-29 19:15:08 +05:30
Rucha Mahabal
b7c61ff651
fix: don't refresh connections for same node
...
- remove all connectors while expanding a group node
2021-06-29 18:21:42 +05:30
GangaManoj
b4b6c8e262
Revert "fix: Test"
...
This reverts commit feed97ec53
2021-06-29 17:58:39 +05:30
Rucha Mahabal
f5314293c6
feat: connectors for mobile node cards
2021-06-29 17:48:44 +05:30
Deepesh Garg
9181dde86a
fix: Cancelation of Loan Security Pledges
2021-06-29 17:18:39 +05:30
Rucha Mahabal
1f10a99910
fix: Employee Inactive status implications ( #26245 )
2021-06-29 15:58:56 +05:30
Rucha Mahabal
91dcc07e26
fix: Employee Inactive status implications ( #26244 )
2021-06-29 15:58:46 +05:30
Rucha Mahabal
8f2b8e47f7
fix: Employee Inactive status implications ( #26243 )
2021-06-29 15:58:30 +05:30
Rucha Mahabal
25e8723032
fix: expanded node group interactions and visibility
2021-06-29 15:06:09 +05:30
Rucha Mahabal
6e3a7b4a75
feat(mobile): sibling node group expansion and rendering
2021-06-29 11:12:47 +05:30
Rohit Waghchaure
2d1c4fee1d
fix: allow to changes to date in the blanket order
2021-06-29 00:33:55 +05:30
GangaManoj
d748e7f49c
fix: Create common function for fetching conversion rate details of linked docs
2021-06-28 22:39:43 +05:30
GangaManoj
506d5ac3d5
fix: Make exchange rate handling more efficient
2021-06-28 22:39:43 +05:30
GangaManoj
8f52db788a
fix(Purchase Invoice): Improve test for exchange rate difference handling
2021-06-28 22:39:41 +05:30
GangaManoj
a826fb8f95
fix(Purchase Receipt): Remove print statements
2021-06-28 22:38:59 +05:30
GangaManoj
3f5e7bf6d7
fix(Purchase Invoice): Fetch Purchase Receipt details using a function
2021-06-28 22:38:59 +05:30
marination
feed97ec53
fix: Test
2021-06-28 22:38:21 +05:30
GangaManoj
5314445d58
fix(Purchase Receipt): Add test for exchange rate difference handling
2021-06-28 22:02:57 +05:30
GangaManoj
d97505b277
fix(Purchase Receipt): Resolve difference caused by change in exchange rate
2021-06-28 22:02:22 +05:30
GangaManoj
206313d69b
fix(Purchase Invoice): Add test for exchange rate difference handling
2021-06-28 22:02:20 +05:30
GangaManoj
6233eaa3bb
fix(Purchase Invoice): Fix condition
2021-06-28 22:00:49 +05:30
GangaManoj
785a71dcd2
fix(Purchase Invoice): Resolve difference caused by change in exchange rate
2021-06-28 22:00:49 +05:30
Saqib
4277e4c94b
fix: unreachable test case ( #26234 )
2021-06-28 19:10:46 +05:30
Dany Robert
31afc61190
fix: Update test cases to suit values from exchangerate.host
2021-06-28 19:05:51 +05:30
Dany Robert
e9bc2f354b
feat: Increase number of supported currency exchanges
...
Switch from frankfurter.app to exchange rate.host to accommodate more currency usage.
2021-06-28 19:01:52 +05:30
rohitwaghchaure
3c97839826
Merge pull request #26130 from rohitwaghchaure/develop-production-plan-fix-to-show-parent-warehouse
...
fix: allow to select group warehouse while downloading materials from…
2021-06-28 17:18:55 +05:30
rohitwaghchaure
9bcc402f41
Merge pull request #26230 from rohitwaghchaure/fixed-fetch-bom-items-in-stock-reco-pre
...
fix: fetch batch items in stock reconciliation
2021-06-28 15:18:07 +05:30
Saqib
40c90d03a4
fix(Asset Repair): cancellation
2021-06-28 11:42:28 +05:30
Deepesh Garg
7d7d797ffc
fix: Do not consider cancelled entries in party dashboard
2021-06-28 11:24:32 +05:30
Saqib
4b69563a56
Merge branch 'develop' into asset-repair-refactor
2021-06-28 11:07:58 +05:30
Deepesh Garg
ebc46c1e09
fix: Update account heads in GST test cases
2021-06-28 10:52:38 +05:30
Deepesh Garg
cf445eb7b4
fix: Add validate bank account method back
2021-06-26 23:59:47 +05:30
Deepesh Garg
1e5482cedd
fix: Revert Changes
2021-06-26 23:49:32 +05:30
Rohit Waghchaure
478360397d
fix: fetch batch items in stock reco
2021-06-26 22:31:03 +05:30
Rohit Waghchaure
5d5dc56f94
fix: removed values out of sync validation from stock transactions
2021-06-26 22:29:19 +05:30
rohitwaghchaure
c1853ddf73
Merge pull request #26226 from rohitwaghchaure/fixed-removed-values-out-of-sync-on-stock-transaction-submission
...
fix: removed values out of sync validation from stock transactions
2021-06-26 22:28:42 +05:30
Rohit Waghchaure
170f2ad056
fix: removed values out of sync validation from stock transactions
2021-06-26 21:42:47 +05:30
Rohit Waghchaure
e5c47f8957
fix: fetch batch items in stock reco
2021-06-26 17:40:27 +05:30
GangaManoj
ca2dbcec59
fix(Asset Repair): Rearrange fields
2021-06-26 01:32:17 +05:30
Ankush Menat
6588a936d5
fix: order and time of operations for multilevel bom
...
- Order of operations was being sorted by idx of individual operations in
BOM table, which made the ordering useless.
- This adds ordering that's sorted from lowest level item to top level
item.
- chore: remove dead functionality. There's no `items` table. Required
item level operations get overwritten on fetching of items /
operations e.g. when clicking on multi-level BOM checkbox.
- test: add test for tree representation
- feat: BOMTree class to get complete representation of a tree
2021-06-25 20:16:11 +05:30
Ankush Menat
9af3f12411
fix(ux): show bom in operations child table
2021-06-25 20:16:11 +05:30
Ankush Menat
b4e7ee0e45
chore: remove dead and py2 compatibility code
...
form_grid_template doesn't exist
2021-06-25 20:16:11 +05:30
Ankush Menat
805ac4ffdf
fix: order and time of operations for multilevel bom
...
- Order of operations was being sorted by idx of individual operations in
BOM table, which made the ordering useless.
- This adds ordering that's sorted from lowest level item to top level
item.
- chore: remove dead functionality. There's no `items` table. Required
item level operations get overwritten on fetching of items /
operations e.g. when clicking on multi-level BOM checkbox.
- test: add test for tree representation
- feat: BOMTree class to get complete representation of a tree
2021-06-25 16:44:57 +05:30
Ankush Menat
305bbc7619
fix(ux): show bom in operations child table
...
# Conflicts:
# erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
2021-06-25 16:44:57 +05:30
Ankush Menat
923832c316
chore: remove dead and py2 compatibility code
...
form_grid_template doesn't exist
2021-06-25 16:44:57 +05:30
18alantom
98c9b0e9ed
refactor: remove unused func, sider fixes
2021-06-25 16:13:09 +05:30
Marica
5474c09c70
Merge pull request #25886 from ankush/work_order_flat_ops
...
fix: order and time of operations in multilevel BOM work order
2021-06-25 16:05:54 +05:30
Ankush Menat
9e43445f36
fix: order and time of operations for multilevel bom
...
- Order of operations was being sorted by idx of individual operations in
BOM table, which made the ordering useless.
- This adds ordering that's sorted from lowest level item to top level
item.
- chore: remove dead functionality. There's no `items` table. Required
item level operations get overwritten on fetching of items /
operations e.g. when clicking on multi-level BOM checkbox.
- test: add test for tree representation
- feat: BOMTree class to get complete representation of a tree
2021-06-25 14:44:55 +05:30
Ankush Menat
6ec8875434
fix(ux): show bom in operations child table
2021-06-25 14:44:53 +05:30
Ankush Menat
ff4aadc657
chore: remove dead and py2 compatibility code
...
form_grid_template doesn't exist
2021-06-25 14:43:49 +05:30
Deepesh Garg
8dd99c02cc
fix: Check for is None
2021-06-25 14:27:50 +05:30
Deepesh Garg
cae42b48f1
fix: Error while fetching item taxes
2021-06-25 14:27:43 +05:30
Deepesh Garg
6eb8d19cc9
fix: Check for is None
2021-06-25 14:02:12 +05:30
Deepesh Garg
cd36ba7e64
fix: Error while fetching item taxes
2021-06-25 14:02:04 +05:30
Deepesh Garg
e955a4ee72
fix: Check for is None
2021-06-25 13:38:06 +05:30
Deepesh Garg
2ca9b765ef
fix: Error while fetching item taxes
2021-06-25 13:34:00 +05:30
Ankush
532a224c44
fix: precision rate for packed items ( #26046 ) ( #26217 )
...
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
2021-06-25 13:28:01 +05:30
Noah Jacob
58daf5f916
fix: precision rate for packed items ( #26046 )
2021-06-25 12:52:17 +05:30
Alan
37a25308ae
fix: add validation for 'for_qty' else throws errors ( #25829 ) ( #26214 )
...
* fix: add validation for 'for_qty' else throws errors
* fix: check if for_qty is None
* fix: check purpose
* fix: add purpose to pick list get_doc
* fix: set as read only to prevent se from picking up value
* chore: undo changes to doctype modified timestamp
2021-06-25 12:40:38 +05:30
Subin Tom
43f85a2877
fix: changed profitability analysis report width ( #26165 )
2021-06-25 11:38:11 +05:30
Deepesh Garg
3239f774bd
Merge pull request #26183 from deepeshgarg007/item_tax_fetch_fix_develop
...
fix: User is not able to change item tax template
2021-06-25 10:46:14 +05:30
GangaManoj
dcb8a2895c
fix(Asset Repair): Simplify code for Asset Repair creation in tests
2021-06-24 22:30:08 +05:30
GangaManoj
c73e137bfa
fix(Asset Repair): Edit description for total_repair_cost
2021-06-24 22:27:30 +05:30
GangaManoj
b44e4121da
fix(Asset Repair): Move filters for cost_center, warehouse and project to setup
2021-06-24 22:25:45 +05:30
GangaManoj
289b449f2b
fix(Asset): Add comment
2021-06-24 22:21:08 +05:30
GangaManoj
f4e8e7d933
fix(Asset): Remove extra tabs
2021-06-24 22:18:59 +05:30
Deepesh Garg
7b7796c1ed
fix: Linting fixes
2021-06-24 21:13:18 +05:30
Deepesh Garg
8cdd7ce7b6
fix: Add python 3 compatible string types
2021-06-24 21:13:10 +05:30
Deepesh Garg
dce2676f7a
Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_payment_tax
2021-06-24 21:08:57 +05:30
Deepesh Garg
c151c67d97
fix: Flaky test
2021-06-24 21:08:19 +05:30
Alan
8958f55890
fix: add validation for 'for_qty' else throws errors ( #25829 )
...
* fix: add validation for 'for_qty' else throws errors
* fix: check if for_qty is None
* fix: check purpose
* fix: add purpose to pick list get_doc
* fix: set as read only to prevent se from picking up value
Co-authored-by: Ankush <ankushmenat@gmail.com>
* chore: undo changes to doctype modified timestamp
Co-authored-by: Ankush <ankushmenat@gmail.com>
2021-06-24 21:01:55 +05:30
Ankush
21e44b19f0
perf: don't query unless required (bp #26175 )
...
re-order conditionals so queries are not evaluated unless required.
# Conflicts:
# erpnext/stock/doctype/batch/batch.py
2021-06-24 20:58:07 +05:30
Ankush
2ea750eadd
perf: don't query unless required ( #26175 )
...
re-order conditionals so queries are not evaluated unless required.
2021-06-24 20:29:18 +05:30
Noah Jacob
0ceec76d98
refactor: update cost updates operation time and hour rates in BOM (fp #25891 )
...
* refactor: updates hour_rate and operation time on update cost
* refactor: hour_rates are updated in routing when updated in workstations
* test: test cases for updating hour_rates and operation time in linked bom
2021-06-24 20:27:47 +05:30
Nabin Hait
67768faaef
Merge branch 'version-13-hotfix' into version-13-pre-release
2021-06-24 20:16:04 +05:30
Deepesh Garg
b4b76b75cd
Merge pull request #26176 from deepeshgarg007/item_tax_fetch_fix
...
fix: User is not able to change item tax template
2021-06-24 19:55:49 +05:30
Deepesh Garg
970d2af7ad
Merge pull request #26211 from deepeshgarg007/include_dimension_filter
...
fix: Account filter not working with accounting dimension filter
2021-06-24 19:55:12 +05:30
Deepesh Garg
1564d39bf4
Merge pull request #26188 from deepeshgarg007/internal_transfer_payment_tax_v13
...
fix: Taxes on Internal Transfer payment entry
2021-06-24 19:51:48 +05:30
Deepesh Garg
e3ca177828
fix: Remove debug flag
2021-06-24 19:51:23 +05:30
Deepesh Garg
bdba29bab5
fix: Account filter not working with accounting dimension filter
2021-06-24 19:48:11 +05:30
Ankush
5708b7140b
fix: batch nos in packed items (bp #26105 )
...
* test: batch info in packed_items
* fix(ux): make packed items editable
* refactor: allow custom table name for set_batch
In some doctypes there are multiple child tables requiring batched
items. This change makes the function a bit more flexible.
* fix: Auto fetch batch_nos in packed_item table
2021-06-24 19:38:37 +05:30
Noah Jacob
ac0bc1f170
fix: precision rate for packed items ( #26208 )
2021-06-24 19:36:17 +05:30
Saqib
b3a0a7b432
fix: too many writes while renaming company abbreviation ( #26203 )
2021-06-24 19:30:10 +05:30
Saqib
64c6b34b94
fix: too many writes while renaming company abbreviation ( #26142 )
2021-06-24 19:29:56 +05:30
Saqib
3b5978cdb8
Merge pull request #26093 from nextchamp-saqib/pr-item-gl-fix
...
fix: purchase receipt gl entries with same item code
2021-06-24 19:29:08 +05:30
Deepesh Garg
1658107a92
fix: Linting fixes
2021-06-24 19:18:50 +05:30
Deepesh Garg
e21e435a0d
fix: Add python 3 compatible string types
2021-06-24 19:17:58 +05:30
Nabin Hait
a57976660a
fix: merge conflict
2021-06-24 19:14:33 +05:30
Ankush
7a63d782db
fix: batch nos in packed items ( #26105 )
...
* test: batch info in packed_items
* fix(ux): make packed items editable
* refactor: allow custom table name for set_batch
In some doctypes there are multiple child tables requiring batched
items. This change makes the function a bit more flexible.
* fix: Auto fetch batch_nos in packed_item table
2021-06-24 19:07:16 +05:30
Deepesh Garg
9382b1f154
fix: Flaky test
2021-06-24 19:03:22 +05:30
Deepesh Garg
acbf56f162
Merge pull request #26182 from deepeshgarg007/gstr_1_export_invoices_error_develop
...
fix: Export invoices not visible in GSTR-1 report
2021-06-24 18:43:40 +05:30
Deepesh Garg
11591b3e3e
Merge pull request #26202 from nextchamp-saqib/pr-item-gl-fix-v13
...
fix: purchase receipt gl entries with same item code
2021-06-24 18:36:23 +05:30
Anuja Pawar
a50196bcd9
fix: dunning permission error in payment entry ( #26204 )
2021-06-24 18:25:16 +05:30
rohitwaghchaure
27797ffa46
Merge pull request #24523 from rohitwaghchaure/sub-operation-new-branch
...
Feat: Job Card Enhancements
2021-06-24 18:19:42 +05:30
Rohit Waghchaure
2330c41cca
fix: total time calculation
2021-06-24 18:14:19 +05:30
Rohit Waghchaure
57307443f0
is corrective job card
2021-06-24 18:14:19 +05:30
Rohit Waghchaure
c878389050
fix: or condition filter in the get_all
2021-06-24 18:14:18 +05:30
Jannat Patel
6a9798f305
fix: update leave allocation after submit ( #26191 )
...
* fix: update leave allocation after submit v13
* fix: test
* fix: test
2021-06-24 18:11:33 +05:30
Rohit Waghchaure
fcab53b238
fix: skip job card
2021-06-24 18:07:31 +05:30
Rohit Waghchaure
6e81489095
feat: Job Card Enhancements
2021-06-24 18:07:30 +05:30
Saqib Ansari
f6dce4df73
test: service item purchase with perpetual inventory enabled
2021-06-24 17:41:52 +05:30
Saqib Ansari
1ca8f6a51d
fix: purchase receipt gl entries with same item code
2021-06-24 17:41:44 +05:30
Saqib
c10fea8a59
Merge branch 'develop' into pr-item-gl-fix
2021-06-24 17:39:36 +05:30
Saqib
2980db30ce
Merge pull request #26157 from nextchamp-saqib/pos-fixes-9
...
refactor(pos): use pos invoice item name as unique identifier
2021-06-24 17:38:41 +05:30
Saqib
81d164134d
Merge pull request #26198 from nextchamp-saqib/pos-fixes-9-v13
...
refactor(pos): use pos invoice item name as unique identifier
2021-06-24 17:37:51 +05:30
Afshan
9dc625c1c9
fix: validate product bundle for existing transactions before deletion ( #25978 )
2021-06-24 17:36:39 +05:30
Deepesh Garg
79daed00c1
Merge pull request #26201 from noahjacob/shipping_address_fix_v13
...
fix: fetch preferred shipping address (bp #26132 )
2021-06-24 17:35:34 +05:30
Deepesh Garg
755ebdf582
Update party.js
2021-06-24 17:35:14 +05:30
Deepesh Garg
e693cceb58
Merge pull request #26132 from noahjacob/shipping_address_fix
...
fix: fetch preferred shipping address
2021-06-24 17:31:21 +05:30
Deepesh Garg
f84f8d5260
Update party.js
2021-06-24 17:29:55 +05:30
Noah Jacob
da82bd4b51
refactor: update cost updates operation time and hour rates in BOM ( #25891 )
...
* refactor: updates hour_rate and operation time on update cost
* refactor: hour_rates are updated in routing when updated in workstations
* test: test cases for updating hour_rates and operation time in linked bom
2021-06-24 17:23:21 +05:30
Noah Jacob
dbdf2515cd
fix: fetches correct preferred shipping address
2021-06-24 17:06:18 +05:30
Nabin Hait
5b462ad11a
fix: merge conflict
2021-06-24 15:36:51 +05:30
Nabin Hait
b5d1a7731c
bumped to version 13.5.2
2021-06-24 15:55:50 +05:50
Nabin Hait
c1954ec72a
Merge pull request #26195 from deepeshgarg007/deferred_revenue_error
...
fix: Error while booking deferred revenue
2021-06-24 15:35:02 +05:30
Nabin Hait
7a8a449ed4
Merge pull request #26197 from deepeshgarg007/deferred_revenue_error_pre_release
...
fix: Error while booking deferred revenue
2021-06-24 15:34:58 +05:30
GangaManoj
e21d44c5c3
fix(Asset): Remove to_date field
2021-06-24 15:04:44 +05:30
Saqib Ansari
3b12601461
fix: sider issues
2021-06-24 15:03:04 +05:30
Saqib Ansari
e39c3f2e69
fix: add missing semicolons
2021-06-24 15:02:59 +05:30
Saqib Ansari
ea70f6f933
fix: hide images from cart & details
2021-06-24 15:02:53 +05:30
Saqib Ansari
54cc1dedf2
refactor(pos): use pos invoice item name as unique identifier
2021-06-24 15:02:43 +05:30
Saqib Ansari
4d3e748c00
fix: sider issues
2021-06-24 15:01:33 +05:30
Marica
bf3e191570
Merge pull request #26193 from marination/country-modal-cart-v13-release
...
fix: Address Card issues in e-commerce
2021-06-24 14:57:39 +05:30
GangaManoj
2fdb923953
fix(Asset Repair): Change controller hooks
2021-06-24 14:56:34 +05:30
Deepesh Garg
f79a72dbf3
fix: Error while booking deferred revenue
2021-06-24 14:49:09 +05:30
Saqib
73aaa1c275
Merge branch 'develop' into pos-fixes-9
2021-06-24 14:31:19 +05:30
Saqib Ansari
8aa0e31bb4
fix: add missing semicolons
2021-06-24 14:29:22 +05:30
Afshan
7fd44907ba
feat: fetching of qty as per received qty from PR to PI ( #26184 )
2021-06-24 14:26:36 +05:30
Ankush
98e98d25e6
fix(Work Order): added freeze when trying to stop work order ( #26192 ) ( #26196 )
...
* fix: added freeze when trying to stop work order
* fix(ux): add freeze message
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
2021-06-24 14:24:28 +05:30
Noah Jacob
b2b7369874
fix(Work Order): added freeze when trying to stop work order ( #26192 )
...
* fix: added freeze when trying to stop work order
* fix(ux): add freeze message
2021-06-24 14:21:35 +05:30
Deepesh Garg
ca2e914715
fix: Error while booking deferred revenue
2021-06-24 14:14:46 +05:30
marination
820a579051
chore: Test for Item visibility in multiple item group pages
2021-06-24 13:57:18 +05:30
marination
4f0e6cd911
fix: Sider
2021-06-24 13:57:00 +05:30
marination
f913838373
fix: Consider Table Multiselect fields in Query engine
...
- Since table multiselect fields were not handled, the query tried searching for this child field in item master
- This broke the query
- On trying to reload or go back to all-products page with field filters that are table mutiselect, page breaks
2021-06-24 13:56:49 +05:30
marination
9f305e983c
fix: Filters did not consider Website Item Group
2021-06-24 13:56:35 +05:30
marination
ea2408744a
fix: Consider Website Item Groups in Item group page product listing
...
- Passed an argument to query engine to know when query is for item group page
- If for item group page, get data with regards to website item group table
- This query should be fast since there's one filter and that shortens the table beforehand
- This data is merged with the results from the Item master (results only considering item attributes and field filters)
- The combined data is then sorted as per weightage
Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
2021-06-24 13:56:15 +05:30
marination
5884f1aeb0
fix: (style) Address card buttons hover state
2021-06-24 13:50:29 +05:30
marination
26bec9d7b4
fix: Country Link field in 'Add address' website modal auto-clears
2021-06-24 13:50:18 +05:30
Marica
ce99701150
Merge pull request #26170 from marination/web-item-group
...
fix: Website item group logic for product listing in Item Group pages
2021-06-24 13:28:18 +05:30
GangaManoj
550fe8ae39
fix(Asset): Remove redundant code
2021-06-24 13:22:26 +05:30
Rucha Mahabal
e81775d6f7
chore: remove unused import
2021-06-24 13:18:49 +05:30
Jannat Patel
ca8c3b90f0
fix: Update leave allocation after submit ( #25975 )
...
* update leave allocation after submit
* fix: leave allocation update after submit
* fix: circular dependency
* fix: replaced update with submit in tests
* fix: replaced update with submit in tests
* fix: updating total leaves allocated
2021-06-24 13:13:03 +05:30
marination
a4f5dcaa9a
chore: Test for Item visibility in multiple item group pages
2021-06-24 13:08:20 +05:30
Rucha Mahabal
357657fa73
chore: create a separate controller file for EmployeeBoardingController
2021-06-24 13:00:50 +05:30
GangaManoj
60a44ae1e6
fix(Asset): Fix test
2021-06-24 12:44:13 +05:30
Marica
6b15a05de4
Merge pull request #26187 from marination/country-modal-cart
...
fix: Address Card issues in e-commerce
2021-06-24 12:25:21 +05:30
Rucha Mahabal
c5c858e428
Merge branch 'develop' into fix-employee-onboarding-status
2021-06-24 12:24:44 +05:30
Deepesh Garg
437e972108
Merge pull request #26143 from deepeshgarg007/gstr_1_export_invoices_error
...
fix: Export invoices not visible in GSTR-1 report
2021-06-24 12:15:29 +05:30
Deepesh Garg
ab7a16a952
Merge pull request #26180 from deepeshgarg007/pi_billing_address_develop
...
fix: Billing address not fetched in Purchase Invoice
2021-06-24 12:13:17 +05:30
Deepesh Garg
5b119ac4a4
Merge pull request #26178 from deepeshgarg007/payroll_accounting_dimension_develop
...
fix: Accounting Dimensions for payroll entry accrual Journal Entry
2021-06-24 12:12:37 +05:30
Deepesh Garg
9d8e8f8bdf
fix: Do not show received amount after tax for internal tarnsfers
2021-06-24 12:02:39 +05:30
Deepesh Garg
bd9317956b
fix: Taxes on Internal Transfer payment entry
2021-06-24 12:02:32 +05:30
marination
bbe64b5604
fix: (style) Address card buttons hover state
2021-06-24 12:01:12 +05:30
Rucha Mahabal
a9b5dc6030
fix: chart not visible for First Response Time reports ( #26032 ) ( #26185 )
2021-06-24 11:53:28 +05:30
Ganga Manoj
604f0b8f01
fix: message on successful creation of opening invoices ( #25998 )
2021-06-24 11:04:27 +05:30
marination
f5fa1ee4b6
fix: Country Link field in 'Add address' website modal auto-clears
2021-06-24 11:03:32 +05:30
Rucha Mahabal
7dbb032468
fix: chart not visible for First Response Time reports ( #26032 )
2021-06-24 10:41:56 +05:30
Deepesh Garg
269962a8dc
fix: Check if item tax template exists
2021-06-24 10:40:07 +05:30
Deepesh Garg
808f83f385
fix: Make item tax templates optional
2021-06-24 10:39:58 +05:30
Deepesh Garg
94d460412a
fix: User is not able to change item tax template
2021-06-24 10:39:49 +05:30
Deepesh Garg
5e49bee755
Merge pull request #26083 from deepeshgarg007/payroll_accounting_dimension
...
fix: Accounting Dimensions for payroll entry accrual Journal Entry
2021-06-24 10:38:42 +05:30
Deepesh Garg
2dc90dd8ac
fix: Export invoices not visible in GSTR-1 report
2021-06-24 10:37:19 +05:30
Deepesh Garg
03b629c851
Merge pull request #26100 from deepeshgarg007/pi_billing_address
...
fix: Billing address not fetched in Purchase Invoice
2021-06-24 10:29:01 +05:30
Deepesh Garg
7bef18f3d8
fix: Remove unintentional changes
2021-06-24 10:28:25 +05:30
Deepesh Garg
c8a6b31f06
Merge branch 'develop' of https://github.com/frappe/erpnext into pi_billing_address_develop
2021-06-24 10:27:16 +05:30
Deepesh Garg
da7f45130b
fix: Billing address not fetched in Purchase Invoice
2021-06-24 10:25:24 +05:30
Deepesh Garg
5f5bbf622a
Merge pull request #26179 from deepeshgarg007/sales_order_billed_qty_develop
...
fix: Incorrect billed qty in Sales Order analytics
2021-06-24 10:22:07 +05:30
Deepesh Garg
4cf0b02ddc
Merge pull request #26095 from deepeshgarg007/sales_order_billed_qty
...
fix: Incorrect billed qty in Sales Order analytics
2021-06-24 10:21:57 +05:30
Deepesh Garg
70823b6d9a
fix: Incorrect billed qty in Sales Order analytics
2021-06-24 10:21:17 +05:30
Deepesh Garg
c451f43f64
fix(minor): Translation and linting issues
2021-06-24 10:18:46 +05:30
Deepesh Garg
3da0541000
fix: Accouting Dimensions for payroll entry accrual Journal Entry
2021-06-24 10:18:36 +05:30
Afshan
53fefd7513
feat: fetching of qty as per received qty from PR to PI ( #25837 )
2021-06-24 10:09:02 +05:30
Deepesh Garg
3007c9900b
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into payroll_accounting_dimension
2021-06-23 23:06:15 +05:30
Deepesh Garg
7e006496dd
fix: Check if item tax template exists
2021-06-23 22:52:51 +05:30
Deepesh Garg
c9c1d10435
fix: Make item tax templates optional
2021-06-23 22:47:29 +05:30
GangaManoj
dce2113736
fix(Asset Repair): Remove test that's no longer necessary
2021-06-23 22:26:45 +05:30
GangaManoj
2f5f9d8566
fix(Asset): Fix value_after_depreciation calculation
2021-06-23 22:19:05 +05:30
Deepesh Garg
1f7b95f390
fix: User is not able to change item tax template
2021-06-23 20:56:27 +05:30
marination
078826d510
fix: Sider
2021-06-23 20:12:59 +05:30
marination
f913e0dd05
fix: Consider Table Multiselect fields in Query engine
...
- Since table multiselect fields were not handled, the query tried searching for this child field in item master
- This broke the query
- On trying to reload or go back to all-products page with field filters that are table mutiselect, page breaks
2021-06-23 20:06:11 +05:30
Noah Jacob
b4b6288596
fix: fetches correct preferred shipping address
2021-06-23 17:05:44 +05:30
rohitwaghchaure
b4863bfa50
Merge pull request #25696 from rohitwaghchaure/incorrect-serial-no-qty-valuation-report
...
feat: Incorrect valuation rate report for serialized items
2021-06-23 16:52:51 +05:30
marination
1b9b72d12e
fix: Filters did not consider Website Item Group
2021-06-23 16:03:24 +05:30
Deepesh Garg
0bfffddac4
fix: Test Cases
2021-06-23 15:37:17 +05:30
marination
d802d73973
fix: Consider Website Item Groups in Item group page product listing
...
- Passed an argument to query engine to know when query is for item group page
- If for item group page, get data with regards to website item group table
- This query should be fast since there's one filter and that shortens the table beforehand
- This data is merged with the results from the Item master (results only considering item attributes and field filters)
- The combined data is then sorted as per weightage
Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
2021-06-23 14:24:13 +05:30
Jannat Patel
9ec0ded28f
fix: Staffing plan vacancies data type issue ( #25941 )
...
* fix: staffing plan vacancies data type issue
* fix: translation issue
* fix: removed greater than 0 condition
2021-06-23 14:05:10 +05:30
Jannat Patel
da66cefefc
fix: staffing plan vacancies data type issue ( #25936 )
...
* fix: staffing plan vacancies data type issue
* fix: translation issue
* fix: removed greater than 0 condition
* fix: sider
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-06-23 14:04:48 +05:30
GangaManoj
80399802c6
fix(Asset Repair): Replace asset_value with value_after_depreciation in tests
2021-06-23 13:26:47 +05:30
Deepesh Garg
35e11fbea6
fix: Tests
2021-06-23 13:17:01 +05:30
Anurag Mishra
d021db1cb1
fix: Training event ( #26164 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-06-23 12:59:43 +05:30
Deepesh Garg
208b5f9e73
chore: Add comments
2021-06-23 12:44:56 +05:30
Deepesh Garg
40a4330ec1
fix: Move tax categories up in country wise json
2021-06-23 12:38:37 +05:30
Jannat Patel
44815393b3
fix: job applicant link issue ( #25934 )
2021-06-23 12:28:02 +05:30
Jannat Patel
0354ec6363
fix: job applicant link issue ( #25933 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-06-23 12:27:45 +05:30
Anurag Mishra
11c155e6ce
feat: Employee Grievance ( #25705 ) ( #26162 )
...
* 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>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-06-23 12:13:32 +05:30
GangaManoj
88348e2da7
fix(Sales Invoice): Print appropriate message if Asset isn't specified when the Item is a Fixed Asset
2021-06-23 11:57:53 +05:30
Deepesh Garg
e8817f97d6
Merge pull request #26150 from nemesis189/changed-profitability-analysis-report-width
...
fix: Changed profitability analysis report width
2021-06-23 11:36:43 +05:30
Deepesh Garg
673470705b
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup
2021-06-23 11:33:15 +05:30
GangaManoj
32d7b1f6ad
fix(Sales Invoice): Fix GL Entry creation for Return Invoices linked with Assets
2021-06-23 11:24:05 +05:30
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
Saqib
46ae97dfd3
Merge branch 'develop' into pr-item-gl-fix
2021-06-23 11:02:48 +05:30
Saqib
5a824cad81
fix: cannot cancel payment entry if linked with invoices ( #26075 )
2021-06-23 11:02:05 +05:30
Saqib
08c269510e
Merge branch 'develop' into pos-fixes-9
2021-06-23 10:15:07 +05:30
GangaManoj
8127208774
fix(Sales Invoice): Reset Asset status on issuing Credit Note
2021-06-22 23:12:56 +05:30
GangaManoj
721ff9438a
Merge branch 'develop' into asset-credit-note
2021-06-22 22:45:11 +05:30
marination
ea2c02738d
fix: Include Stock Reco logic in update_qty_in_future_sle
2021-06-22 21:44:50 +05:30
Saqib Ansari
75ce023170
fix: hide images from cart & details
2021-06-22 21:18:44 +05:30
Saqib Ansari
3b225b13e8
refactor(pos): use pos invoice item name as unique identifier
2021-06-22 21:18:20 +05:30
Deepesh Garg
dc6e4f12c6
Merge pull request #26076 from nextchamp-saqib/export-round-off-fix
...
fix(e-invoicing): IRN generation for export invoices with round off
2021-06-22 20:45:24 +05:30
Deepesh Garg
7b0d86ead5
fix: Do not show received amount after tax for internal tarnsfers
2021-06-22 20:38:35 +05:30
Deepesh Garg
2af8c171c1
fix: Taxes on Internal Transfer payment entry
2021-06-22 19:48:08 +05:30
Noah Jacob
ce72d0c2c1
fix: fixed rounding off ordered percent to 100 in condition ( #26148 )
2021-06-22 17:54:16 +05:30
Noah Jacob
c05496a5a7
fix: fixed rounding off ordered percent to 100 in condition ( #26152 )
2021-06-22 17:53:53 +05:30
GangaManoj
2e45965405
fix(Asset Repair): Fix Sider issues
2021-06-22 17:24:14 +05:30
GangaManoj
859c8c92f7
fix: Remove changes made to Asset Maintenance
2021-06-22 17:16:12 +05:30
Subin Tom
a446d61e10
fix: Changed profitability analysis report width
2021-06-22 16:51:15 +05:30
GangaManoj
2ea325c0c3
fix(Asset Repair): Revert Stock Entry on cancellation
2021-06-22 16:33:10 +05:30
Subin Tom
219a87d530
fix: disable sales order cancellation if linked to draft invoice ( #26125 )
2021-06-22 16:28:58 +05:30
GangaManoj
3a44d88866
fix(Asset): Fix tests for Asset Repair
2021-06-22 16:28:29 +05:30
Subin Tom
e3a697c582
fix: disable sales order cancellation if linked to draft invoice ( #26104 )
2021-06-22 16:27:53 +05:30
Subin Tom
889140fd8c
fix: sql syntax error in get_project_name method ( #26147 )
2021-06-22 16:26:19 +05:30
GangaManoj
3b0eac79bf
fix(Asset Repair): Compute total_value
2021-06-22 16:26:09 +05:30
Saqib
4b4eb990a9
Merge branch 'develop' into asset-repair-refactor
2021-06-22 16:21:13 +05:30
Subin Tom
943b46a759
fix: sql syntax error in get_project_name method ( #26145 )
2021-06-22 14:26:36 +05:30
Deepesh Garg
cfdda21dd2
fix: Export invoices not visible in GSTR-1 report
2021-06-22 13:03:22 +05:30
marination
c212d7fafd
fix: Sort website products by weightage mentioned in Item master
2021-06-22 11:20:23 +05:30
Marica
703c30f5f8
fix: Consistent alert indicators
2021-06-22 11:20:17 +05:30
Dany Robert
884dd9764b
Merge branch 'develop' into patch-4
2021-06-22 11:18:17 +05:30
GangaManoj
d0d5fedd48
fix(Sales Invoice): Print appropriate message if item.asset is missing when the Item is a Fixed Asset
2021-06-22 00:22:08 +05:30
GangaManoj
5b07e58412
fix(Sales Invoice): Let invoice be created for Sold Assets if it's a return invoice
2021-06-21 23:51:09 +05:30
GangaManoj
600333875a
fix(Sales Invoice): Let item.asset be copied on duplicating the doc
2021-06-21 23:41:35 +05:30
rohitwaghchaure
82adb4f16e
Merge pull request #26118 from rohitwaghchaure/fixed-linking-between-mr-and-sq-develop
...
fix: material request and supplier quotation not linked if supplier quotation created from supplier portal
2021-06-21 22:36:03 +05:30
Rucha Mahabal
cce19db826
feat: org chart mobile interactions
2021-06-21 21:55:50 +05:30
marination
f97206b3cb
fix: Sort website products by weightage mentioned in Item master
2021-06-21 19:38:37 +05:30
GangaManoj
5776a962b3
fix(Asset Repair): Return Depreciation Schedule to original state on cancellation
2021-06-21 18:57:11 +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
rohitwaghchaure
6a07869e55
Update production_plan.js
2021-06-21 15:41:30 +05:30
Noah Jacob
38f105eaee
test: test cases for fetching customer group details
2021-06-21 15:40:13 +05:30
Rohit Waghchaure
00c05108b2
fix: allow to select group warehouse while downloading materials from production plan
2021-06-21 15:39:49 +05:30
rohitwaghchaure
d6eacf556d
Merge pull request #26126 from rohitwaghchaure/production-plan-fix-to-show-parent-warehouse
...
fix: allow to select group warehouse while downloading materials from production plan
2021-06-21 15:39:13 +05:30
Noah Jacob
acef77fb53
test: test case for fetching supplier group details
2021-06-21 15:39:05 +05:30
rohitwaghchaure
8347eb1dba
Update production_plan.js
2021-06-21 15:38:44 +05:30
Noah Jacob
89215e44a4
feat: details fetched from customer group in customer
2021-06-21 15:37:17 +05:30
Noah Jacob
ffe306c2f6
feat: details fetched from supplier group in supplier
2021-06-21 15:36:46 +05:30
GangaManoj
91a99e0d89
fix(Asset Repair): Increase stock quantity and decrease asset value on cancellation
2021-06-21 15:22:02 +05:30
GangaManoj
f88a13b292
fix(Asset Repair): Compute total_value instantly
2021-06-21 15:02:40 +05:30
Rohit Waghchaure
01faa9ca11
fix: rate not able to change in purchase order
2021-06-21 14:56:38 +05:30
GangaManoj
a34bf5edec
fix: Rename 'Stock Item' to 'Asset Repair Consumed Item'
2021-06-21 14:55:34 +05:30
Rohit Waghchaure
773aabae44
fix: allow to select group warehouse while downloading materials from production plan
2021-06-21 14:54:27 +05:30
GangaManoj
b081d79332
fix(Asset Repair): Fix tests
2021-06-21 14:52:00 +05:30
rohitwaghchaure
3956f82e7c
Merge pull request #26122 from rohitwaghchaure/fix-rate-not-able-to-change
...
fix: rate not able to change in purchase order
2021-06-21 13:40:29 +05:30
Nabin Hait
27f0495156
Merge branch 'version-13' into develop
2021-06-21 11:28:58 +05:30
Nabin Hait
94484d7766
bumped to version 13.5.1
2021-06-21 11:48:57 +05:50
Afshan
127d637b3d
fix: check for duplicate payment terms in Payment Term Template ( #25999 )
2021-06-21 11:24:45 +05:30
Ankush
7dae0fbe95
fix: status indicator for delivery notes (bp #26062 )
...
On list view `per_returned` isn't fetched i.e. `undefined` which become
0 hence the list view indicator is false.
This "computation" is already done by status updater, so relying on
doc.status is better than redefining it.
2021-06-21 11:19:47 +05:30
Saqib Ansari
9b54aee43e
test: service item purchase with perpetual inventory enabled
2021-06-21 11:18:56 +05:30
Saqib Ansari
d329e27346
Merge branch 'develop' of https://github.com/frappe/erpnext into pr-item-gl-fix
2021-06-21 11:18:45 +05:30
Ankush
e78364c191
fix: status indicator for delivery notes ( #26062 )
...
On list view `per_returned` isn't fetched i.e. `undefined` which become
0 hence the list view indicator is false.
This "computation" is already done by status updater, so relying on
doc.status is better than redefining it.
2021-06-21 11:15:16 +05:30
Saqib
d8d3e536e0
Merge branch 'develop' into export-round-off-fix
2021-06-21 10:52:12 +05:30
Saqib
fb89008a13
fix(pos): unsupported operand type -=: for 'float' and 'NoneType' ( #26097 )
2021-06-21 10:49:09 +05:30
Saqib
7ff19ebec8
fix(pos): unsupported operand type -= for 'float' and 'NoneType' ( #26096 )
2021-06-21 10:48:50 +05:30
Saqib Ansari
99531a35e0
fix(pos): unsupported operand type -= for 'float' and 'NoneType'
2021-06-21 10:47:23 +05:30
Rohit Waghchaure
582f187726
fix: rate not able to change in purchase order
2021-06-21 00:59:02 +05:30
GangaManoj
740df95c58
fix(Asset Repair): Set completion_date on changing repair_status to 'Completed'
2021-06-20 17:44:35 +05:30
Rohit Waghchaure
f0dfea1d47
fix: test case for Project Profitability report
2021-06-20 15:31:25 +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
d755b29943
fix: toggle consumed qty field based on condition
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
9e616b09a2
fix: material request and supplier quotation not linked if sq created from supplier portal against rfq
2021-06-20 15:17:20 +05:30
rohitwaghchaure
ab3cd7e283
Merge pull request #26023 from rohitwaghchaure/fixed-linking-between-mr-and-sq
...
fix: material request and supplier quotation not linked if supplier quotation created from supplier portal
2021-06-20 15:16:32 +05:30
Rucha Mahabal
c1ba35b25b
feat: Organizational Chart
2021-06-20 12:42:06 +05:30
Rohit Waghchaure
3d7f660bec
fix: test case for Project Profitability report
2021-06-20 10:20:35 +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
2fb5291785
fix: toggle consumed qty field based on condition
2021-06-19 23:16:22 +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
rohitwaghchaure
a2bb1b8acd
Merge pull request #26081 from rohitwaghchaure/fixed-stock-entry-submission-performance
...
fix: time out while submit / cancel the stock transactions with more than 50 Items
2021-06-19 16:14:14 +05:30
Rohit Waghchaure
8c844e4515
fix: material request and supplier quotation not linked if sq created from supplier portal against rfq
2021-06-19 16:08:26 +05:30
GangaManoj
23876c0854
fix(Asset Repair): Prevent some fields from being copied on duplicating the doc
2021-06-19 15:23:06 +05:30
GangaManoj
012b9eaeff
fix(Asset Repair): Make Error Description non-mandatory
2021-06-19 15:18:54 +05:30
GangaManoj
7db7988e4c
fix(Asset Repair): Add Stock Entry field
2021-06-19 14:54:30 +05:30
GangaManoj
09ba6f6477
fix(Asset Repair): Move Total Repair Cost to the Stock Consumption Details section
2021-06-19 14:06:45 +05:30
GangaManoj
da8da9fa4e
fix: Replace edit_dates with flags.increase_in_asset_life
2021-06-19 14:00:26 +05:30
GangaManoj
2b93e54e1f
fix(Asset Repair): Fix depreciation_amount calculation
2021-06-19 13:45:37 +05:30
GangaManoj
93b9752771
fix: Add comments
2021-06-19 13:06:27 +05:30
Dany Robert
ba288274f2
fix: ignore permission to update call log
2021-06-19 12:31:12 +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
Deepesh Garg
52992b345f
Merge pull request #26106 from deepeshgarg007/loan_repay_via_salary
...
fix: Sanctioned loan amount limit check
2021-06-18 23:30:54 +05:30
Deepesh Garg
81c97c13ce
fix: Sanctioned loan amount limit check
2021-06-18 19:57:53 +05:30
Deepesh Garg
22e75725ea
fix: Sanctioned loan amount limit check
2021-06-18 17:25:37 +05:30
Anurag Mishra
ef6e005c04
Merge pull request #26071 from Anurag810/training_event_fixes_2.0
...
fix: Training event
2021-06-18 15:44:56 +05:30
Ankush
4e88dcf956
fix: auto unlink warehouse from item on delete ( #26073 ) ( #26101 )
...
* fix: auto unlink warehouse from item on delete
* fix: sider
* refactor: use delete_doc
* test: add test for unlinking warehouse from item
* refactor: add msgprint to inform user of unlink
* refactor: cleanup and reuse extant functions
* fix: don't delete row, update table
Co-authored-by: Alan <2.alan.tom@gmail.com>
2021-06-18 14:48:30 +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
Ganga Manoj
3d8f82459b
fix(Issue): reset response_by and resolution_by if SLA is removed ( #25997 )
2021-06-18 11:42:28 +05:30
Anuja Pawar
b066fe9519
fix: insufficient permission for dunning error ( #26092 )
2021-06-18 11:29:07 +05:30
Saqib
5633834ef7
Merge branch 'develop' into export-round-off-fix
2021-06-18 11:25:21 +05:30
Saqib
cceabff6e1
Merge branch 'develop' into pr-item-gl-fix
2021-06-18 11:24:54 +05:30
Rohit Waghchaure
7fc50ba460
fix: timeout while cancelling stock reconciliation
2021-06-18 10:45:53 +05:30
Deepesh Garg
a58b571ccb
fix: Billing address not fetched in Purchase Invoice
2021-06-18 10:45:35 +05:30
rohitwaghchaure
3bb9f4a742
Merge pull request #26098 from rohitwaghchaure/enqueue-cancel-action-in-stock-reco
...
fix: timeout while cancelling stock reconciliation
2021-06-18 10:44:59 +05:30
Rohit Waghchaure
ef97269386
fix: timeout while cancelling stock reconciliation
2021-06-18 10:11:53 +05:30
GangaManoj
94dfd0e318
fix(Asset): Add function to clear old depreciation schedule
2021-06-18 09:59:45 +05:30
GangaManoj
354116142a
fix(Asset Repair): Create GL Entries for each item in Stock Items
2021-06-18 09:53:18 +05:30
Suraj Shetty
6894cc2832
Merge pull request #26088 from surajshetty3416/refactor-website-routing
2021-06-17 20:43:23 +05:30
Deepesh Garg
59e2e4989b
fix: Incorrect billed qty in Sales Order analytics
2021-06-17 19:58:16 +05:30
Eben van Deventer
ddef85ae97
fix: Correct South Africa VAT Rate ( #25894 )
...
On 1 April 2018 South Africa increased the VAT rate from 14% to 15%, this proposed change seeks to update the default parameters for a fresh ERPNext installation.
2021-06-17 18:43:30 +05:30
Deepesh Garg
ceb9d9e870
Merge branch 'develop' into patch-3
2021-06-17 18:26:42 +05:30
Alan
f9390f596d
fix: auto unlink warehouse from item on delete ( #26073 )
...
* fix: auto unlink warehouse from item on delete
* fix: sider
* refactor: use delete_doc
* test: add test for unlinking warehouse from item
* refactor: add msgprint to inform user of unlink
* refactor: cleanup and reuse extant functions
* fix: don't delete row, update table
2021-06-17 18:13:23 +05:30
Deepesh Garg
d3ccb024f8
Merge pull request #26078 from nemesis189/fixed-label-rate-for-purchase-invoice-item-v13
...
fix: removed extra space from label rate
2021-06-17 17:19:17 +05:30
Saqib Ansari
61675f1a43
fix: purchase receipt gl entries with same item code
2021-06-17 13:05:43 +05:30
GangaManoj
05c70ac584
fix(Asset): Replace asset_value with value_after_depreciation in Finance Books
2021-06-17 13:02:02 +05:30
Deepesh Garg
510077b3d4
fix(minor): Translation and linting issues
2021-06-17 11:21:21 +05:30
Deepesh Garg
b8442816ca
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into payroll_accounting_dimension
2021-06-17 11:19:12 +05:30
Suraj Shetty
00332d1834
Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing
2021-06-17 09:47:16 +05:30
GangaManoj
66d4e2ba51
fix(Asset Repair): Display value_after_depreciation in Finance Books
2021-06-17 08:28:19 +05:30
Anupam
dc448c2f51
refactor: lead
2021-06-17 00:28:03 +05:30
Deepesh Garg
913e92c29f
Merge pull request #26044 from GangaManoj/account-multiselect-gl
...
feat(General Ledger): Implement multi-account selection
2021-06-16 22:33:50 +05:30
Deepesh Garg
5c19a9251f
fix: Accouting Dimensions for payroll entry accrual Journal Entry
2021-06-16 22:14:29 +05:30
Subin Tom
6f9de8c86f
fix: removed extra space from label rate
2021-06-16 20:01:29 +05:30
Subin Tom
c03a947e98
fix: removed extra space from label rate
2021-06-16 19:47:55 +05:30
Saqib Ansari
2be7e90e78
fix(e-invoicing): IRN generation for export invoices with round off
2021-06-16 19:00:34 +05:30
GangaManoj
41b7c1aec0
fix(General Ledger): Improve account filter
2021-06-16 14:40:14 +05:30
Afshan
3b1b4684ba
fix: check for duplicate payment terms in Payment Term Template ( #26003 )
2021-06-16 14:30:45 +05:30
Afshan
8c73f6f19e
fix(pos): pos loyalty card alignment ( #26051 )
2021-06-16 14:28:26 +05:30
Afshan
d5c172590f
fix(pos): pos loyalty card alignment ( #26050 )
2021-06-16 14:28:03 +05:30
Saqib
60ce00531d
fix: label for enabling ledger posting of change amount ( #26070 )
2021-06-16 14:25:55 +05:30
GangaManoj
86f689e54a
fix(General Ledger): Get account_currency accurately
2021-06-16 14:23:02 +05:30
Anurag Mishra
b1c72da7d7
fix: Training event
2021-06-16 14:08:32 +05:30
Saqib
1fd80992d7
fix(pos): 'NoneType' object is not iterable ( #26066 )
2021-06-16 13:27:34 +05:30
Ankush
fd84847f2b
fix: syntax fixes for native class ( #26064 )
2021-06-16 11:14:40 +05:30
Deepesh Garg
d70c6996f2
Merge pull request #25951 from nextchamp-saqib/invoice-opening-pnl-validation
...
fix: opening invoices can alter profit and loss of a closed year
2021-06-16 10:52:40 +05:30
GangaManoj
34997789cd
fix(Asset Repair): Filter Warehouse by Company
2021-06-16 10:48:07 +05:30
GangaManoj
6d6aee29e8
fix(Asset Repair): Fix GL Entry creation
2021-06-16 10:42:37 +05:30
GangaManoj
491763fa27
fix(Asset Repair): Fix Sider issues
2021-06-16 08:45:54 +05:30
GangaManoj
a33e751b0f
fix(Asset Repair): Make Cost Center non-mandatory
2021-06-16 08:35:50 +05:30
GangaManoj
abb0c769a4
fix(Asset Repair): Uncheck allow_on_submit for all fields
2021-06-16 08:33:05 +05:30
GangaManoj
c61bbc5915
fix(Asset Repair): Use existing function from asset.py for fetching fixed_asset_account
2021-06-16 08:26:02 +05:30
GangaManoj
94ac52c47d
fix(Asset Repair): Add mandatory_depends_on condition for Purchase Invoice
2021-06-16 08:18:45 +05:30
GangaManoj
71c60f75d7
fix(Asset Repair): Filter Cost Center and Project by Company
2021-06-16 08:13:36 +05:30
GangaManoj
9e07b7d4a7
fix(Asset Repair): Add Company field
2021-06-16 08:07:06 +05:30
GangaManoj
bf52f55870
fix(Asset Repair): Make Stock Items and Warehouse mandatory if stock_consumption is checked
2021-06-16 07:56:40 +05:30
GangaManoj
695cd70994
fix(Asset Repair): Add title to error messages
2021-06-16 07:50:03 +05:30
GangaManoj
14ea9ebcb7
fix(Asset Repair): Display fields according to the state of the doc
2021-06-16 07:03:32 +05:30
GangaManoj
53a9ac4466
fix(General Ledger): Condense account_conditions
2021-06-16 04:10:29 +05:30
GangaManoj
79dc0f0afc
fix: Remove console.log()
2021-06-16 03:37:11 +05:30
Deepesh Garg
fb9cb78980
Merge pull request #26045 from GangaManoj/filter-cc-project
...
fix(General Ledger): Filter Cost Center and Project drop-down lists by Company
2021-06-15 21:18:49 +05:30
Nabin Hait
0950481253
fix: merge conflict
2021-06-15 20:18:06 +05:30
Nabin Hait
24a88f6cf6
bumped to version 13.5.0
2021-06-15 20:18:40 +05:50
Nabin Hait
1e2df2c109
fix(pos): 'NoneType' object is not iterable
2021-06-15 19:53:57 +05:30
Nabin Hait
b2f2d0e749
chore: Added change log for v13.5.0
2021-06-15 19:44:06 +05:30
Noah Jacob
b5a1491176
fix: escaped warehouse value for sql query ( #26049 )
2021-06-15 12:44:04 +05:30
Deepesh Garg
95bc141531
Merge pull request #26056 from deepeshgarg007/gst_taxtable_value_with_discount_v13
...
fix(India): Taxable value for invoices with additional discount
2021-06-15 12:05:16 +05:30
GangaManoj
285bc60684
fix(Asset Repair): Set asset_name as title
2021-06-15 12:02:07 +05:30
GangaManoj
d4acf87feb
fix(Asset Repair): Make Accounting Dimensions section collapsible
2021-06-15 11:37:17 +05:30
Deepesh Garg
433815daba
fix: Update einvoice json test
2021-06-14 20:43:51 +05:30
Deepesh Garg
4afda3c89c
fix(India): Taxable value for invoices with additional discount
2021-06-14 20:43:42 +05:30
Deepesh Garg
5149101045
Merge pull request #26037 from deepeshgarg007/payment_entry_auto_tax_fixes
...
fix: Auto tax calculations in Payment Entry
2021-06-14 20:39:41 +05:30
Deepesh Garg
bbf6121bb5
fix: Revert unintended changes
2021-06-14 20:09:31 +05:30
Deepesh Garg
ac52daa14f
fix: Import throw
2021-06-14 20:09:23 +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
Saqib
80077d215f
fix: patch for adding doctype to sla ( #26053 )
2021-06-14 19:34:25 +05:30
Himanshu
ec25d5938b
feat(SLA): Apply SLA to any document ( #22449 )
2021-06-14 19:05:52 +05:30
Deepesh Garg
cf1fc40b06
Merge pull request #25906 from deepeshgarg007/gst_taxtable_value_with_discount
...
fix(India): Taxable value for invoices with additional discount
2021-06-14 17:11:08 +05:30
Marica
ff1360a8e6
Merge branch 'develop' into subcontracted-rm-to-transfer-report-develop
2021-06-14 16:48:57 +05:30
GangaManoj
75b30efb05
fix(General Ledger): Filter Project drop-down list by Company
2021-06-14 16:42:27 +05:30
GangaManoj
27ec51f021
fix(General Ledger): Filter Cost Center drop-down list by Company
2021-06-14 16:41:56 +05:30
marination
5d082b05a9
fix: Flaky test for Report Subcontracted Raw materials to be transferred
2021-06-14 16:31:45 +05:30
marination
3b070d1b05
fix: Flaky test for Report Subcontracted Raw materials to be transferred
2021-06-14 14:51:33 +05:30
Deepesh Garg
9eac4d0af6
fix: Import throw
2021-06-14 14:44:19 +05:30
Deepesh Garg
8718013c96
fix: Add separate function to validate payment entry taxes
2021-06-14 14:34:44 +05:30
GangaManoj
0511ffcf30
fix(General Ledger): Implement multi-account selection
2021-06-14 13:22:44 +05:30
Nabin Hait
580b4d50b5
Merge pull request #26027 from ruchamahabal/add-inactive-status-to-employee
...
feat: add Inactive status to Employee
2021-06-14 12:34:33 +05:30
Nabin Hait
ad58182395
Merge pull request #26030 from ruchamahabal/add-inactive-status-to-employee-v13
...
feat: add Inactive status to Employee
2021-06-14 12:33:28 +05:30
Suraj Shetty
d1902dfadb
Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing
2021-06-14 12:25:49 +05:30
Deepesh Garg
856484aeb0
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_taxtable_value_with_discount
2021-06-14 11:29:41 +05:30
Deepesh Garg
580346360f
fix: Auto tax calculations in Payment Entry
2021-06-14 11:16:39 +05:30
Marica
d37912fff1
Merge branch 'develop' into subcontracted-rm-to-transfer-report-develop
2021-06-12 16:00:14 +05:30
Anoop
28cdff10cf
fix: update linked Customer on Patient update only if Link Customer to Patient is enabled ( #25926 )
2021-06-12 14:17:04 +05:30
Rucha Mahabal
cf349aadf9
fix: unable to enter score in Assessment Result details grid ( #25945 ) ( #26031 )
2021-06-12 14:05:12 +05:30
Rucha Mahabal
0ed33aa4e8
fix: unable to enter score in Assessment Result details grid ( #25945 )
2021-06-12 13:40:58 +05:30
Rucha Mahabal
17550fb4bf
feat: add Inactive status to Employee
2021-06-12 13:36:47 +05:30
Rucha Mahabal
efd7d584b2
feat: add Inactive status to Employee
2021-06-12 13:34:20 +05:30
Rucha Mahabal
a38147a8ba
feat: add Inactive status to Employee
2021-06-12 13:33:21 +05:30
Anupam Kumar
400205cc8a
fix: payroll entry employee detail issue ( #25968 )
...
* fix: payroll entry employee detail issue
* fix: review changes
2021-06-12 12:30:53 +05:30
Ankush Menat
348f04ca82
fix: syntax error in serial/batch selector ( #26024 )
2021-06-11 21:01:30 +05:30
Ankush Menat
9891780f5a
perf(minor): remove unnecessary comprehensions (port #25645 )
2021-06-11 18:40:22 +05:30
Marica
19d36be624
Merge branch 'develop' into subcontracted-rm-to-transfer-report-develop
2021-06-11 17:50:43 +05:30
Marica
d7d5c4c329
Merge pull request #26011 from marination/subcontracted-rm-to-transfer-report
...
fix: Report Subcontracted Raw Materials to be Transferred
2021-06-11 17:50:30 +05:30
marination
ea3e61d3b0
fix: Test
2021-06-11 17:29:55 +05:30
marination
c4d851e45f
fix: Test
2021-06-11 17:27:43 +05:30
Ankush Menat
a424c0c023
test(perf): eliminate repeat creation of HSN codes (bp #25947 )
2021-06-11 16:49:39 +05:30
Ankush Menat
a9c84f749a
perf(minor): remove unnecessary comprehensions ( #25645 )
2021-06-11 16:00:48 +05:30
Ankush Menat
5bb89b0ead
test(perf): eliminate repeat creation of HSN codes ( #25947 )
2021-06-11 15:57:01 +05:30
marination
a4ed6a3519
fix: Sider
2021-06-11 12:51:36 +05:30
marination
c5da51dd7a
fix: Report Raw Materials to be Transferred
2021-06-11 12:51:10 +05:30
marination
ec4a3723cc
fix: Sider
2021-06-11 12:47:06 +05:30
rohitwaghchaure
387de3f3fa
Merge pull request #26015 from rohitwaghchaure/fixed-timeout-error-in-repost-item-valuation-develop
...
fix: timeout error in the repost item valuation
2021-06-11 12:18:13 +05:30
rohitwaghchaure
da28db3698
Merge pull request #26016 from rohitwaghchaure/fixed-conversion-factor-issue-develop
...
fix: custom conversion factor field not mapped from job card to stock entry
2021-06-11 12:17:54 +05:30
rohitwaghchaure
49f3e5bbd5
Merge pull request #26017 from rohitwaghchaure/donot-copy-difference-account-develop
...
fix: on click of duplicate button system has not copied the difference account
2021-06-11 12:17:36 +05:30
Rohit Waghchaure
17408c6388
fix: on click of duplicate button system copy the difference account from first row
2021-06-11 10:58:00 +05:30
Rohit Waghchaure
9cfd3adad9
fix: custom conversion factor field not mapped from job card to stock entry
2021-06-11 10:56:44 +05:30
Rohit Waghchaure
b103b24ae1
fix: timeout error in the repost item valuation
2021-06-11 10:55:05 +05:30
Rohit Waghchaure
f310501d7d
fix: filter type for item query
2021-06-11 10:53:07 +05:30
marination
687ad9b942
fix: Report Raw Materials to be Transferred
2021-06-10 21:18:19 +05:30
Nabin Hait
42d72b55b8
Merge branch 'version-13-hotfix' into version-13-pre-release
2021-06-10 20:26:31 +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
gavin
46cc089f8b
Merge branch 'develop' into payroll-emp-detail
2021-06-10 20:15:28 +05:30
Nabin Hait
27299cfcc5
Merge branch 'version-13-hotfix' into version-13-pre-release
2021-06-10 19:45:38 +05:30
Anupam
32ebb1001e
fix: review chnages
2021-06-10 19:32:00 +05:30
Deepesh Garg
48f2839079
fix: Sort account balances by account name
2021-06-10 19:00:50 +05:30
Deepesh Garg
3b34fc4cce
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13
2021-06-10 18:57:31 +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
0d49b6c211
Merge pull request #26004 from gavindsouza/patch-tests-v13
...
ci: Update Patch tests (backport)
2021-06-10 18:52:27 +05:30
Saqib
9a67141bfb
fix(einvoicing): service item check ( #26010 )
2021-06-10 18:48:55 +05:30
Deepesh Garg
9a243ed469
fix: Sort account balances by account name
2021-06-10 18:16:46 +05:30
Deepesh Garg
a5c3427293
fix: Sort account balances by account name
2021-06-10 18:09:49 +05:30
Deepesh Garg
88176e65e4
fix: Check for gst_hsn_code
2021-06-10 17:31:28 +05:30
walstanb
8f5ae0470d
fix: syntax error in stock entry
2021-06-10 16:35:27 +05:30
Gavin D'souza
137d08a9d7
fix: Manually link_fields from flags before rename_doc
2021-06-10 15:09:17 +05:30
Gavin D'souza
96f8ebc308
fix(patch): Handle NULL values from fieldtype change
2021-06-10 15:08:55 +05:30
Gavin D'souza
3dfbfe87e9
chore: Drop < v10 patches from list
...
v7 backup was restored and upgraded to latest v10.x.x branch. The patches run uptil the upgrade are removed in this change. This means only existing v10 sites are allowed direct upgrade to v13 and newer
There are older version patches still left since they're being used in later ERPNext versions too.
2021-06-10 15:07:56 +05:30
Gavin D'souza
aedf25ba46
chore: Drop old patches
...
v7 backup was restored and upgraded to latest v10.x.x branch. The
patches run uptil the upgrade are removed in this change. This means
only existing v10 sites are allowed direct upgrade to v13 and newer
2021-06-10 15:07:39 +05:30
rohitwaghchaure
8975c5241e
Merge pull request #25988 from rohitwaghchaure/donot-copy-difference-account
...
fix: on click of duplicate button system has not copied the difference account
2021-06-10 14:39:56 +05:30
rohitwaghchaure
64cc60f97a
Merge pull request #25946 from gavindsouza/patch-tests
...
ci: Update Patch tests
2021-06-10 14:11:08 +05:30
Deepesh Garg
882913ca4e
Merge pull request #26000 from GangaManoj/gst-settings-card
...
fix: Only display GST card in Accounting Workspace if it's in India
2021-06-10 12:46:15 +05:30
Deepesh Garg
d063f9a5d1
fix: GL Entry ordering
2021-06-10 12:26:21 +05:30
GangaManoj
076bd5eaab
fix: Only display GST card in Accounting Workspace if it's in India
2021-06-10 12:08:44 +05:30
Deepesh Garg
701cba7f03
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_taxtable_value_with_discount
2021-06-10 12:04:38 +05:30
Deepesh Garg
edecd5b0c6
fix: Update einvoice json test
2021-06-10 12:04:30 +05:30
Deepesh Garg
0b5fe1b5eb
fix: Failing test case
2021-06-10 10:34:49 +05:30
Deepesh Garg
911818a9e2
fix: Add multiple fixes
2021-06-09 22:55:10 +05:30
Saqib
42557c4ad3
feat: cost-center wise period closing entry ( #25766 )
2021-06-09 19:48:31 +05:30
Saqib
26f0609390
feat: enable/disable gl entry posting for change given in pos ( #25822 )
2021-06-09 19:47:28 +05:30
Deepesh Garg
9e648183db
fix: Test case
2021-06-09 18:26:16 +05:30
Deepesh Garg
7dabb6be30
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13
2021-06-09 18:10:55 +05:30
Deepesh Garg
b57ebba3fd
fix: Validate negative allocated amount in Payment Entry ( #25799 )
2021-06-09 17:56:41 +05:30
Deepesh Garg
4c1dad8207
fix: Debug tests
2021-06-09 14:18:23 +05:30
Deepesh Garg
8090965162
fix: Debug test
2021-06-09 13:45:42 +05:30
Deepesh Garg
758db793be
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13
2021-06-09 13:39:07 +05:30
Deepesh Garg
bf5f87c2fe
Merge pull request #25969 from deepeshgarg007/inernal_transfer_invoices_ignore
...
fix: Ignore internal transfer invoices from GST Reports
2021-06-09 13:32:52 +05:30
Deepesh Garg
be631d1caf
Merge pull request #25986 from nextchamp-saqib/einvoicing-service-item-check
...
fix(e-invoicing): service item check
2021-06-09 13:00:43 +05:30
Anupam Kumar
21b8e2f0d8
fix: hiding Rounding Adjustment field ( #25380 )
...
* fix: hiding Rounding Adjustment field
* fix: updating purchase_invoice.json
2021-06-09 12:57:21 +05:30
Deepesh Garg
9a282aa593
Merge pull request #25858 from alyf-de/item-tax-templates
...
feat: Item Tax Templates for Germany
2021-06-09 12:50:27 +05:30
Rohit Waghchaure
99b583f688
fix: on click of duplicate button system copy the difference account from first row
2021-06-09 00:06:35 +05:30
Saqib Ansari
18eed58fc5
fix(e-invoicing): service item check
2021-06-08 20:52:14 +05:30
Jannat Patel
6b8c123fd9
fix: Quiz timer ( #25983 )
...
* fix: quiz timer
* fix: pass time bound parameter
* fix: sider
2021-06-08 18:57:49 +05:30
Rucha Mahabal
5ed2ef493a
Merge pull request #25984 from pateljannat/quiz-fixes-v13
...
fix: Quiz fixes v13
2021-06-08 18:57:24 +05:30
pateljannat
7ace06ac21
fix: sider
2021-06-08 18:26:23 +05:30
walstanb
646f0c3b53
fix: variable declaration
2021-06-08 17:54:34 +05:30
Saqib
6eeaf9b933
Merge branch 'version-13-hotfix' into asset-repair-refactor
2021-06-08 17:26:50 +05:30
Ganga Manoj
0ea4d850e1
fix: Allow all System Managers to delete company transactions ( #25834 )
2021-06-08 17:23:44 +05:30
pateljannat
bbf07d9214
fix: quiz timer issues
2021-06-08 17:05:44 +05:30
Deepesh Garg
e4fcc5562f
refactor: Advance taxes and charges calculation
2021-06-08 16:35:47 +05:30
Sagar Vora
062e247353
test: remove unused imports
2021-06-08 14:43:28 +05:30
Sagar Vora
ca205be5ac
fix: tests
2021-06-08 14:43:28 +05:30
Sagar Vora
0e5e1350b2
perf: use frappe.get_value with wildcard instead of another frappe.get_doc call
2021-06-08 14:43:28 +05:30
Sagar Vora
74818c7b62
fix: improve filter for from_date; validation for joining and relieving date
2021-06-08 14:43:28 +05:30
Sagar Vora
447c978757
fix: choose correct Salary Structure Assignment when getting data for formula eval
2021-06-08 14:43:28 +05:30
Sagar Vora
5b1e7a61b8
test: remove unused imports
2021-06-07 19:34:02 +05:30
Sagar Vora
7f5378d98a
fix: tests
2021-06-07 18:40:54 +05:30
Anuja Pawar
d4398fd84a
fix: update cost center from pos ( #25971 )
2021-06-07 16:20:21 +05:30
18alantom
6f79c4c348
fix: add account filter
2021-06-07 13:58:45 +05:30
18alantom
23b907df1a
fix: use stock value diff for calculation
2021-06-07 13:52:26 +05:30
rohitwaghchaure
cf7baeab16
Merge pull request #25956 from rohitwaghchaure/fixed-conversion-factor-issue
...
fix: custom conversion factor field not mapped from job card to stock entry
2021-06-07 11:45:44 +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
7a20c3b92a
fix: Ignore internal transfer inoices from GST Reports
2021-06-06 19:23:21 +05:30
Deepesh Garg
18be767f75
fix: Remove invalid test
2021-06-06 13:25:34 +05:30
Anupam
bf0528413d
fix: payroll entry employee detail issue
2021-06-06 13:12:13 +05:30
Saqib
d689068d82
Merge pull request #25928 from nextchamp-saqib/pos-fixes-8
...
fix(pos): multiple pos issues
2021-06-06 11:25:29 +05:30
Saqib Ansari
3f32969bee
fix(pos): broken image in item details section
2021-06-06 11:18:20 +05:30
Saqib Ansari
bc46a9772d
fix(pos): cash shortcuts not working
2021-06-06 11:11:07 +05:30
Saqib Ansari
a85c2c16b4
fix(pos): item rate precision in item selector
2021-06-06 11:07:20 +05:30
Deepesh Garg
3646c301ed
fix: Linting issues
2021-06-05 13:21:03 +05:30
Deepesh Garg
e8a78bd43d
fix: Add test cases
2021-06-05 13:16:39 +05:30
Deepesh Garg
8a7e283926
feat: Item Taxes based on net rate
2021-06-04 22:53:26 +05:30
barredterra
572b6df0f2
Merge branch 'version-13-hotfix' into item-tax-templates
2021-06-04 16:55:11 +02:00
gavin
203a363cd6
Merge branch 'develop' into patch-tests
2021-06-04 20:13:15 +05:30
Gavin D'souza
102afe7de1
fix: Manually link_fields from flags before rename_doc
2021-06-04 20:11:34 +05:30
Gavin D'souza
ac99c719bc
Revert "fix(patch): Reload linked doctypes before renaming dt"
...
This reverts commit 4e2e8daca9
2021-06-04 20:10:26 +05:30
Gavin D'souza
4e2e8daca9
fix(patch): Reload linked doctypes before renaming dt
2021-06-04 17:56:28 +05:30
Gavin D'souza
0b7da52ef1
fix(patch): Handle NULL values from fieldtype change
2021-06-04 17:07:45 +05:30
18alantom
672c8bb112
feature: report for cost of goods sold by item group
2021-06-04 16:44:30 +05:30
Sagar Vora
bd92b4339c
perf: use frappe.get_value with wildcard instead of another frappe.get_doc call
2021-06-04 16:09:00 +05:30
Sagar Vora
5657fddb7a
fix: improve filter for from_date; validation for joining and relieving date
2021-06-04 16:09:00 +05:30
Sagar Vora
e80902be8e
fix: choose correct Salary Structure Assignment when getting data for formula eval
2021-06-04 16:09:00 +05:30
Ankush Menat
215516f819
fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice' ( #25902 ) ( #25957 )
...
* fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice'
This error occurs when upgrading from erpnext 13.0.1 to 13.4.0 after typing
bench update --patch --reset
* fix(minor): use .get instead of getattr
Co-authored-by: D Tim Cummings <tim@triptera.com.au>
2021-06-04 13:09:14 +05:30
D Tim Cummings
fb3ec7ccb8
fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice' ( #25902 )
...
* fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice'
This error occurs when upgrading from erpnext 13.0.1 to 13.4.0 after typing
bench update --patch --reset
* fix(minor): use .get instead of getattr
2021-06-04 11:58:45 +05:30
Gavin D'souza
8697e89441
chore: Drop < v10 patches from list
...
v7 backup was restored and upgraded to latest v10.x.x branch. The patches run uptil the upgrade are removed in this change. This means only existing v10 sites are allowed direct upgrade to v13 and newer
There are older version patches still left since they're being used in later ERPNext versions too.
2021-06-04 11:49:56 +05:30
Gavin D'souza
5bf5775b43
chore: Drop old patches
...
v7 backup was restored and upgraded to latest v10.x.x branch. The
patches run uptil the upgrade are removed in this change. This means
only existing v10 sites are allowed direct upgrade to v13 and newer
2021-06-04 11:49:56 +05:30
Rucha Mahabal
3f45901f25
fix: invalid 'depends_on' expression in opportunity ( #25955 )
2021-06-04 11:16:38 +05:30
Rucha Mahabal
3e92089200
fix: invalid 'depends_on' expression in opportunity ( #25953 )
2021-06-04 11:15:38 +05:30
Rohit Waghchaure
af4794b2d1
fix: custom conversion factor field not mapped from job card to stock entry
2021-06-04 10:53:44 +05:30
Saqib
c6e016e545
fix: wrong round off gl entry posted in case of purchase invoice ( #25775 )
2021-06-04 10:08:22 +05:30
Saqib Ansari
4a1e270072
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into pos-fixes-8
2021-06-04 10:04:09 +05:30
Saqib Ansari
48036b4bab
fix: invoices can alter profit and loss of a closed year
2021-06-04 09:54:34 +05:30
GangaManoj
12d9e3b1e6
fix(Asset Repair): Add tests
2021-06-03 22:41:57 +05:30
GangaManoj
b55649f2ec
fix(Asset): Add depreciation schedule details in create_asset()
2021-06-03 22:28:30 +05:30
rohitwaghchaure
25b953ad16
Merge pull request #25854 from rohitwaghchaure/fixed-timeout-error-in-repost-item-valuation
...
fix: timeout error in the repost item valuation
2021-06-03 22:14:22 +05:30
rohitwaghchaure
cd503ce01d
Merge pull request #25938 from rohitwaghchaure/fixed-timeout-error-in-repost-item-valuation-v13-pre
...
fix: timeout error in the repost item valuation
2021-06-03 22:14:01 +05:30
GangaManoj
aa9bbe51bd
fix(Asset Repair): Add Company in GL Entries
2021-06-03 21:28:58 +05:30
GangaManoj
034f7bde33
fix(Asset Repair): Remove unnecessary condition
2021-06-03 21:12:43 +05:30
rohitwaghchaure
c59371ab0c
fix: filter type for item query ( #25942 )
2021-06-03 20:02:58 +05:30
Rohit Waghchaure
8449a47048
fix: filter type for item query
2021-06-03 18:32:28 +05:30
Rucha Mahabal
67519d6b79
fix: boarding status in Employee Onboarding and Separation
...
- make boarding status read-only as its dependent on project
- update boarding status in onboarding/separation on project update
- update tests to check status changes
2021-06-03 18:07:00 +05:30
barredterra
c99eaf106e
Merge branch 'version-13-hotfix' into item-tax-templates
2021-06-03 14:17:43 +02:00
Rohit Waghchaure
4e10ce1632
fix: timeout error in the repost item valuation
2021-06-03 16:35:59 +05:30
Rohit Waghchaure
10558344b0
fix: timeout error in the repost item valuation
2021-06-03 16:34:31 +05:30
Marica
7437748a1d
Merge pull request #25805 from ankush/refactor_item
...
refactor: item doctype
2021-06-03 14:23:18 +05:30
Saqib Ansari
81b9a5ee47
fix(pos): cannot cancel consolidated sales invoice
2021-06-03 12:59:09 +05:30
Saqib Ansari
311b378328
fix(pos): searching items with barcode or serial no
2021-06-03 12:58:53 +05:30
rohitwaghchaure
40b90e5b6e
Merge pull request #25478 from noahjacob/prod_plan_feat
...
feat: Added check box to combine items with same BOM
2021-06-03 12:37:02 +05:30
Anoop
f899b3a633
fix: update linked Customer on Patient update only if Link Customer to Patient is enabled ( #25921 )
2021-06-03 09:24:31 +05:30
GangaManoj
9fb47795c4
fix(Asset Repair): Only modify depreciation schedule if calculate_depreciation is checked
2021-06-03 04:55:49 +05:30
GangaManoj
2ceeb8138d
fix(Asset Repair): Set company when creating Stock Entry
2021-06-03 01:54:44 +05:30
GangaManoj
960840dc3a
fix(Asset Repair): Set completion_date
2021-06-03 01:53:13 +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
8821d71094
bumped to version 13.4.1
2021-06-02 22:34:19 +05:50
barredterra
9affcd8f54
Merge branch 'version-13-hotfix' into item-tax-templates
2021-06-02 17:54:02 +02:00
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
Raffael Meyer
f6627550d1
fix: remove wrong tax_category
2021-06-02 15:17:00 +02:00
barredterra
3c748efae3
feat: add Item Tax Templates for german COAs "SKR03" and "SKR04"
2021-06-02 13:27:15 +02:00
barredterra
b6f27a4cae
feat: set is_default for german tax templates
2021-06-02 13:20:33 +02:00
barredterra
f259bf48aa
refactor: make tax category
2021-06-02 13:20:03 +02:00
barredterra
e3557ff131
Merge branch 'version-13-hotfix' into item-tax-templates
2021-06-02 12:17:27 +02:00
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
Deepesh Garg
7c7c084159
fix: Check for tax category
2021-06-02 14:12:28 +05:30
Deepesh Garg
ca34eec2d6
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup
2021-06-02 13:26:27 +05:30
Deepesh Garg
b3ed807b70
fix: Regional settings setup
2021-06-02 13:26:21 +05:30
Sagar Vora
eff8f6fe34
fix(Payroll): no need to set abbr specially in Salary Slip ( #25877 )
2021-06-01 19:57:17 +05:30
Deepesh Garg
c6dcc9d94a
fix(India): Taxable value for invoices with additional discount
2021-06-01 13:13:04 +05:30
Rohit Waghchaure
6432aaa07a
feat: added reports to check incorrect qty and valuation for serialized items
2021-06-01 12:46:43 +05:30
Fisher Yu
865663857c
fix: chart of accounts importer always error ( #25882 )
...
* fix: chart of accounts importer always error
chart of accounts importer always error Parent Account Missing
* Update chart_of_accounts_importer.py
2021-06-01 12:15:58 +05:30
Ankush Menat
2c7fac0e76
fix: reload doc for possible future schema changes ( #25904 )
2021-06-01 11:56:00 +05:30
Deepesh Garg
2f5885627d
fix: Labeling and other fixes
2021-06-01 11:07:18 +05:30
Jannat Patel
1175e0686b
refactor: leave balance report ( #25771 )
...
* refactor: leave balance report
* refactor: sql to orm
2021-06-01 10:53:00 +05:30
Ganga Manoj
c8b34798fe
fix(Delivery Note): Assign Product Bundle's conversion_factor to Packed Items ( #25840 )
2021-06-01 10:44:26 +05:30
rohitwaghchaure
970f00922d
Merge pull request #25898 from anupamvs/stock-reconciliation
...
fix: featching serialized items
2021-05-31 20:00:35 +05:30
rohitwaghchaure
6463cbd15e
Merge pull request #25897 from anupamvs/stock-reconciliation
...
fix: featching serialized items
2021-05-31 20:00:26 +05:30
Jannat Patel
022b5c973a
fix: wrap dates in getdate for leave application ( #25899 )
...
* fix: wrap dates in getdate for leave application
* fix: translation issue
* fix: replaced today with getdate
2021-05-31 19:49:53 +05:30
Ganga Manoj
908b0090e9
fix: Create POS Invoice for Product Bundles ( #25847 )
...
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-05-31 19:49:03 +05:30
Deepesh Garg
0ea6725baa
fix: Rename Loan Management workspace to Loans ( #25856 )
2021-05-31 19:48:31 +05:30
Anupam
0358b64743
fix: featching serialized items
2021-05-31 15:59:32 +05:30
Eben van Deventer
7f2ae23dbf
Correct South Africa VAT Rate
...
On 1 April 2018 South Africa increased the VAT rate from 14% to 15%, this proposed change seeks to update the default parameters for a fresh ERPNext installation.
This was already done with a commit to version-13 branch under #25894 , this proposed change is to ensure that the update is pulled through to future versions.
2021-05-31 12:24:29 +02:00
Raffael Meyer
80540d38ba
fix: add_deduct_tax in Purchase Taxes setup ( #25871 )
2021-05-31 15:36:20 +05:30
Nabin Hait
a3d1b6973a
fix: merge conflict
2021-05-31 11:21:33 +05:30
Nabin Hait
c63e233bc7
bumped to version 13.4.0
2021-05-31 11:34:33 +05:50
Nabin Hait
4c94ccc8d8
chore: Added change log
2021-05-31 10:51:57 +05:30
Saqib
89f621baa4
fix(pos): closing entry shows incorrect expected amount ( #25868 )
2021-05-31 09:56:49 +05:30
Rucha Mahabal
3be28054de
refactor: Vehicle Expenses Report ( #25727 )
...
* refactor: Vehicle Expense Report
* test: Vehicle Expenses Report
* feat: Added Employee filter to report
- fix Vehicle Log form view
* fix: set currency fieldtype for chart data
- added filters for employee and vehicle
* fix: service expenses not getting set
2021-05-31 09:11:42 +05:30
Marica
42b2ea556f
Merge pull request #25358 from noahjacob/maintenance_feat
...
refactor: maintenance schedule and visit enhancements.
2021-05-30 01:20:30 +05:30
Deepesh Garg
48b1a82fa1
fix: Add accounts and templates for reverse charge
2021-05-29 23:54:51 +05:30
Rucha Mahabal
05d5fb24f7
fix(test): tax detail report ( #25884 )
2021-05-29 23:18:36 +05:30
Deepesh Garg
ea4f8102e8
Merge pull request #25869 from nextchamp-saqib/plaid-link-reset
...
fix(plaid): cannot reset plaid link for a bank account
2021-05-29 20:05:25 +05:30
Deepesh Garg
d067e25dad
Merge pull request #25828 from Anuja-pawar/issue-summary-report-fix
...
fix: Add Hold status column in the Issue Summary Report
2021-05-29 19:24:15 +05:30
Deepesh Garg
c3d8115ca1
Merge pull request #25849 from nextchamp-saqib/pos-rate-as-identifier
...
fix(pos): cannot add same item with different rates
2021-05-29 17:33:11 +05:30
Deepesh Garg
5483f21fe7
Merge pull request #25872 from nextchamp-saqib/fix-pos-broken-img
...
fix(pos): rendering of broken image on pos
2021-05-29 17:28:03 +05:30
Ankush Menat
431d3295b4
fix: use dictionary filter instead of list ( #25874 )
...
Item query doesn't support list filter anymore.
2021-05-28 21:12:25 +05:30
Ankush Menat
2df7f474fa
fix: use dictionary filter instead of list ( #25875 )
...
Item query doesn't support list filter anymore.
2021-05-28 21:12:10 +05:30
Deepesh Garg
fb9cb0fd23
Merge pull request #25866 from deepeshgarg007/itc_reversa_address
...
fix(India): Show only company addresses for ITC reversal entry
2021-05-28 18:46:09 +05:30
Saqib Ansari
b72b4c0bf9
fix(pos): rendering of broken image on pos
2021-05-28 17:38:01 +05:30
Raffael Meyer
6038663bf8
fix: add_deduct_tax in Purchase Taxes setup ( #25757 )
2021-05-28 16:29:28 +05:30
Noah Jacob
6fb218e033
refactor: suggested changes
2021-05-28 16:15:50 +05:30
Saqib Ansari
05386ff12f
chore: remove unwanted method
2021-05-28 12:58:18 +05:30
Deepesh Garg
b084f1d320
fix(India): Show only company addresses for ITC reversal entry
2021-05-28 12:14:56 +05:30
Deepesh Garg
20be7fb93d
fix(India): Show only company addresses for ITC reversal entry
2021-05-28 11:57:38 +05:30
Saqib Ansari
bbce2e91a3
fix: reset plaid link button
2021-05-28 11:56:47 +05:30
Saqib Ansari
d24eccd623
fix(plaid): cannot reset plaid link for a bank account
2021-05-28 11:36:24 +05:30
noahjacob
0b02f1335f
refactor: removed redundant links in test case
2021-05-28 11:04:34 +05:30
noahjacob
d071586589
refactor: removed maintenance schedule detail link
2021-05-28 10:54:35 +05:30
noahjacob
7fa045c1c9
refactor: using parent form links of maintenance schedule
2021-05-28 10:54:35 +05:30
noahjacob
3bca90dbe6
refactor: updated mapping for maintenance schedule links in maintenance visit
2021-05-28 10:54:22 +05:30
Suraj Shetty
68b050de97
Merge pull request #25863 from surajshetty3416/website-theme-fixes-version-13-hotfix
2021-05-28 10:48:23 +05:30
Ganga Manoj
17736afab5
fix(POS): Fix stock availability calculation if negative_stock_allowed is checked ( #25859 )
2021-05-28 10:03:41 +05:30
Ganga Manoj
8a776a63cd
fix(POS): Add Product Bundles to POS item search ( #25860 )
2021-05-28 09:56:30 +05:30
Suraj Shetty
f4db3139b7
refactor: Use css variables for breakpoint value
2021-05-28 09:22:46 +05:30
prssanna
c4d4be3265
fix: ensure website theme is applied correctly
2021-05-28 09:22:45 +05:30
Suraj Shetty
113a6f3d80
fix: Use frappe.safe_eval instead of eval
2021-05-28 09:10:34 +05:30
Suraj Shetty
96542c3d04
style: Fix sider issues
2021-05-28 09:10:34 +05:30
Suraj Shetty
273589e835
test: Fix a case where test used to fail due to holiday list
...
- fixes: "Please set a default Holiday List for Employee EMP-00009 or Company Wind Power LLC" error
2021-05-28 09:10:33 +05:30
Suraj Shetty
54354a84e1
test: Fix permission error
2021-05-28 09:10:33 +05:30
Suraj Shetty
d48ea663d9
test: Fix test name
...
- Rename TestSubcontractedItemToBeReceived > TestSubcontractedItemToBeTransferred
2021-05-28 09:10:33 +05:30
Suraj Shetty
d1a13ec050
test: Fix valuation rate for raw materials
2021-05-28 09:10:33 +05:30
Suraj Shetty
a891d6eed2
fix: allow_zero_valuation_rate for rejected qty
2021-05-28 09:10:33 +05:30
Suraj Shetty
19c5fd72d6
refactor: Rename assertEquals to assertEqual to avoid deprecation warnings
2021-05-28 09:10:33 +05:30
Suraj Shetty
ab8816e11d
test: Fix test dependency
2021-05-28 09:09:36 +05:30
Suraj Shetty
175cb27bcb
test: Pass ConflictingTaxRule during tax rule test
2021-05-28 09:09:36 +05:30
Suraj Shetty
c26d41acf9
chore: Remove unnecessary print statements
2021-05-28 09:09:36 +05:30
Suraj Shetty
232cd28d67
test: Fix dependencies
2021-05-28 09:07:57 +05:30
Suraj Shetty
7b74985a54
test: Fix test_dependencies
2021-05-28 09:07:57 +05:30
Suraj Shetty
34e620fb5b
test: Fix dependency
2021-05-28 09:07:57 +05:30
Suraj Shetty
5f4527a6a1
refactor: Use css variables for breakpoint value
2021-05-28 08:55:38 +05:30
Deepesh Garg
a150645b57
fix: Remove GL Entry from print
2021-05-27 20:10:50 +05:30
Deepesh Garg
2e83cb77ca
fix: Split GL Entry
2021-05-27 20:09:45 +05:30
Deepesh Garg
4311fdc3a1
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup
2021-05-27 17:49:23 +05:30
barredterra
50794407b4
feat: Item Tax Templates for Germany
2021-05-27 14:17:53 +02:00
barredterra
86ee3ebb09
feat: create tax category during taxes setup
2021-05-27 14:16:26 +02:00
barredterra
46d39d27aa
fix: validate company in taxes setup
2021-05-27 14:16:01 +02:00
anushka19
04dfaf3b2a
fix: Broken help links fixed
2021-05-27 17:45:37 +05:30
Deepesh Garg
740c68d075
fix: Debug Test
2021-05-27 17:43:53 +05:30
noahjacob
fbc8694291
refactor: added maintenance schedule links to parent form
2021-05-27 17:37:57 +05:30
noahjacob
bd783e8072
refactor: renamed item_ref to item_reference
2021-05-27 17:34:16 +05:30
Anuja P
753e5894de
fix: ageing error in PSOA
2021-05-27 17:33:22 +05:30
noahjacob
9e4c28852e
refactor: added maintenance visit to maintenance schedule dashboard
2021-05-27 17:25:50 +05:30
Anuja P
bb0a40b995
fix: ageing error in PSOA
2021-05-27 17:15:47 +05:30
Deepesh Garg
ea18230274
fix: Update GL Entry ordering
2021-05-27 16:40:37 +05:30
Suraj Shetty
df680a2c62
Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing
2021-05-27 14:31:37 +05:30
Saqib Ansari
3382655b5e
fix: sider issues
2021-05-27 14:27:38 +05:30
Suraj Shetty
8612558433
Merge branch 'develop' into website-theme-fixes
2021-05-27 13:56:28 +05:30
Saqib Ansari
45a89a7c67
fix(pos): cannot add same item with different rates
2021-05-27 13:49:45 +05:30
Deepesh Garg
be3671fe7b
fix: Create new supplier for test case
2021-05-27 13:27:17 +05:30
Anuja P
e2059fb9f6
fix: spaces to tabs
2021-05-26 20:07:53 +05:30
Anuja P
5e4128e70c
fix: patch for existing issues
2021-05-26 20:03:14 +05:30
noahjacob
dc51388666
style: fixed indentations and formatting
2021-05-26 18:28:24 +05:30
Rohan Bansal
9857d63523
fix: add requested changes
2021-05-26 15:41: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
Marica
477a90e2ac
Merge pull request #25833 from ankush/translation_fixes
...
fix(ux): fix unstranslated text in msgprint/throw
2021-05-26 14:12:36 +05:30
Marica
7342eb64e9
Merge pull request #25810 from marination/se-supplier-customer
...
chore: Cleanup Customer and Supplier Details section in Stock Entry
2021-05-26 14:10:41 +05:30
Anupam Kumar
59769c7a86
fix: student invalid password reset link ( #25825 )
2021-05-26 12:16:04 +05:30
Anupam Kumar
349ef8274b
fix: student invalid password reset link ( #25826 )
2021-05-26 12:14:02 +05:30
Deepesh Garg
36a11bf9ce
Merge pull request #25841 from nextchamp-saqib/fix(gstr-1)--incorrect-gstin-fetched-incase-of-branch-company-address
...
fix(gstr-1): incorrect gstin fetched incase of branch company address
2021-05-26 11:20:30 +05:30
Marica
be157e7467
Merge branch 'version-13-hotfix' into se-supplier-customer
2021-05-26 11:19:50 +05:30
Anurag Mishra
2e0e4a7861
refactor: Additional Salary form clean up ( #25785 )
...
* feat: additional salary clean up
* fix: Label and description
* fix: labels
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-05-26 11:13:19 +05:30
Anuja P
db5217e48e
fix: renaming hold to on hold
2021-05-26 11:09:48 +05:30
Saqib Ansari
0e804e292a
fix(gstr-1): incorrect gstin fetched incase of branch company address
2021-05-26 10:54:16 +05:30
Anuja P
f3f87886a9
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into issue-summary-report-fix
2021-05-26 10:21:46 +05:30
Deepesh Garg
5e27c7dae2
fix: Add non group filter for account
2021-05-25 22:34:58 +05:30
Deepesh Garg
8fddd0f0c1
fix: Update TDS rate for test
2021-05-25 22:03:50 +05:30
GangaManoj
03a6977a01
fix: Sider issues
2021-05-25 21:35:06 +05:30
GangaManoj
1d7dda2664
fix(Asset): Fix depreciation_amount calculation
2021-05-25 21:35:03 +05:30
GangaManoj
28ca383534
feat(Asset): Edit value_after_depreciation
2021-05-25 21:31:13 +05:30
GangaManoj
4b543de329
feat(Asset Repair): Modify depreciation schedule when increase_in_asset_life is not a multiple of frequency_of_depreciation
2021-05-25 21:31:05 +05:30
GangaManoj
4277877883
feat(Asset Repair): Change visibilty of sections
2021-05-25 21:26:46 +05:30
GangaManoj
30fdebafa7
feat(Asset): Modify depreciation schedule
2021-05-25 21:26:46 +05:30
GangaManoj
6bb920f25e
fix(Asset Repair): Only create GL entries if repair cost is capitalised
2021-05-25 21:26:46 +05:30
GangaManoj
8a41f6354a
fix(Asset Repair): Remove 'Payable Account' field
2021-05-25 21:26:46 +05:30
GangaManoj
66e6f01e40
fix(Asset Repair): Make Purchase Invoice mandatory if capitalize_repair_cost is checked
2021-05-25 21:26:46 +05:30
GangaManoj
a8037c1896
fix(Asset Repair): Add Purchase Invoice
2021-05-25 21:26:46 +05:30
GangaManoj
3ab852d4d0
fix(Asset Repair): Fetch 'Asset Name' when 'Asset' is selected
2021-05-25 21:26:45 +05:30
GangaManoj
d5d7cacd67
fix(Asset Repair): Improve code
2021-05-25 21:26:45 +05:30
GangaManoj
15294d5543
feat(Asset Maintenance): Decrease stock quantity if consumed during Asset Maintenance
2021-05-25 21:26:45 +05:30
GangaManoj
a7bbaacfde
fix(Asset Repair): Always add value of consumed Stock Items to Asset value
2021-05-25 21:26:45 +05:30
GangaManoj
70bad470f7
feat(Asset Maintenance): Increase Asset value if Stock Items were consumed
2021-05-25 21:26:45 +05:30
GangaManoj
d1f521701c
feat(Asset Maintenance): Check if Warehouse and Stock Items were entered
2021-05-25 21:26:45 +05:30
GangaManoj
04a909bd99
feat(Asset Maintenance): Add 'Stock Consumption Details' section
2021-05-25 21:26:44 +05:30
GangaManoj
568369a5c2
feat(Asset Maintenance): Add stock_consumption checkbox
2021-05-25 21:26:44 +05:30
GangaManoj
2874d08534
fix(Asset Repair): Rearrange fields
2021-05-25 21:26:44 +05:30
GangaManoj
f7eebf0e78
feat(Asset Repair): Add 'Increase In Asset Life' field
2021-05-25 21:26:44 +05:30
GangaManoj
68b78374b5
fix(Asset): Make Manage button white
2021-05-25 21:26:44 +05:30
GangaManoj
ec72f8956f
fix(Asset Repair): Revert to asset's previous status if repair is completed/cancelled
2021-05-25 21:26:43 +05:30
GangaManoj
1ac1cedfff
feat(Asset Repair): Decrease stock quantity if consumed during Asset Repair
2021-05-25 21:26:43 +05:30
GangaManoj
c8cb96a38f
feat(Asset Repair): Add Warehouse field
2021-05-25 21:26:42 +05:30
GangaManoj
f2fe55ceeb
feat(Asset Repair): Check for Cost Center and Payable Account
2021-05-25 21:26:42 +05:30
GangaManoj
8d05eca45e
feat(Asset Repair): Create GL Entries to capitalise repair cost
2021-05-25 21:26:42 +05:30
GangaManoj
385ca80ceb
feat(Asset Repair): Add total_repair_cost field
2021-05-25 21:26:42 +05:30
GangaManoj
c2b0102852
feat(Asset Repair): Add 'View General Ledger' button
2021-05-25 21:26:41 +05:30
GangaManoj
7ad74cf800
feat(Asset Repair): Add stock_consumption checkbox
2021-05-25 21:26:41 +05:30
GangaManoj
234b473d93
feat(Asset Repair): Remove 'Assign To'
2021-05-25 21:26:41 +05:30
GangaManoj
d554267b05
feat(Asset Repair): Add 'Cost Center' to GL Entries
2021-05-25 21:26:40 +05:30
GangaManoj
f5a2ea9cb3
feat(Asset Repair): Add 'Accounting Dimensions' section
2021-05-25 21:26:40 +05:30
GangaManoj
e5ab5d8963
feat(Asset Repair): Create GL Entries
2021-05-25 21:26:40 +05:30
GangaManoj
0739d4bb1b
feat(Asset Repair): Add value of consumed stock items to asset value
2021-05-25 21:26:39 +05:30
GangaManoj
d2d31fd164
feat(Asset Repair): Add 'Stock Items' table
2021-05-25 21:26:39 +05:30
GangaManoj
c62890bcdb
feat: Create 'Stock Item' child table
2021-05-25 21:26:39 +05:30
GangaManoj
258c238583
feat(Asset Repair): Add repair_cost to asset_value
2021-05-25 21:26:39 +05:30
GangaManoj
6d1cf76b77
feat(Asset): Add 'Asset Value' field
2021-05-25 21:26:39 +05:30
GangaManoj
194a08e4ec
fix(Asset Repair): Hide 'Accounting Details' section till doc gets saved
2021-05-25 21:26:38 +05:30
GangaManoj
1b2a5d1489
feat(Asset Repair): Add 'Capitalize Repair Cost' checkbox
2021-05-25 21:26:38 +05:30
GangaManoj
11594f870e
fix(Company): Add 'Repair and Maintenance Account' field
2021-05-25 21:26:38 +05:30
GangaManoj
88ac9b2ec9
fix(Company): Rename 'Fixed Asset Depreciation Settings' to 'Fixed Asset Deafults'
2021-05-25 21:26:38 +05:30
GangaManoj
deadcd9e97
feat(Asset Repair): Add payable_account field
2021-05-25 21:26:37 +05:30
GangaManoj
30c4a56491
feat(Asset Repair): Change Asset's status according to repair_status
2021-05-25 21:26:37 +05:30
GangaManoj
1c26b27a89
fix(Asset Repair): Display 'Completion Date' and 'Repair Status' only after save
2021-05-25 21:26:37 +05:30
GangaManoj
bbbd61dab8
fix(Asset): Group all buttons under 'Manage'
2021-05-25 21:26:37 +05:30
GangaManoj
3e0e3f0e1b
fix(Asset Repair): Replace 'Item Name' and 'Item Code' with 'Asset Name'
2021-05-25 21:26:36 +05:30
GangaManoj
322975a03c
feat(Asset): Add 'Create > Asset Repair' button
2021-05-25 21:26:36 +05:30
GangaManoj
ed79b224cc
fix(Asset): Group buttons under 'Action'
2021-05-25 21:26:36 +05:30
Ankush Menat
ff96bdf0c1
fix(ux): fix unstranslated text in msgprint/throw
2021-05-25 20:59:20 +05:30
Nabin Hait
e5df60287e
Merge branch 'version-13-hotfix' into version-13-pre-release
2021-05-25 20:42:58 +05:30
Deepesh Garg
81376ea44f
feat: Show net values in Party Accounts ( #25714 )
2021-05-25 20:39:17 +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
Nabin Hait
db95db892c
fix: merge conflict
2021-05-25 19:33:23 +05:30
Ganga Manoj
99636c6aca
fix: rearrange buttons for company doctype ( #25617 )
2021-05-25 19:17:01 +05:30
Afshan
4d61fa2497
fix: incorrect cr/dr shown in general ledger for multi-currency transactions ( #25654 )
2021-05-25 19:16:02 +05:30
Laurynas Sakalauskas
6a62ad325f
fix(plaid): withdrawals and deposits are recorded incorrectly ( #25784 )
2021-05-25 19:09:44 +05:30
Rakshith N
507a211c81
fix: fetch email id from dialog box in pos past order summary' ( #25808 )
2021-05-25 19:03:29 +05:30
Deepesh Garg
84f270e732
fix: Remove unwanted commits
2021-05-25 18:03:42 +05:30
noahjacob
73e41c0bd6
refactor: suggested changes
2021-05-25 18:01:47 +05:30
Deepesh Garg
55a3fb57dd
fix: Linting Issues
2021-05-25 17:40:06 +05:30
Deepesh Garg
36d47f97f4
fix: Linting issues
2021-05-25 17:40:04 +05:30
Deepesh Garg
6f84cee6fe
fix: Uncommentt test
2021-05-25 17:39:06 +05:30
Deepesh Garg
b07f7d1b70
fix: Linting and other fixes
2021-05-25 17:39:04 +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
e2f83ffaa4
fix: Linting fixes and other checks
2021-05-25 17:35:41 +05:30
Deepesh Garg
77dcee9d67
fix: Test Cases
2021-05-25 17:35:15 +05:30
Deepesh Garg
fd380d34f9
fix: Linting errors
2021-05-25 17:35:05 +05:30
Deepesh Garg
a87e3fcb7c
fix: TDS report cleanup
2021-05-25 17:34:45 +05:30
Deepesh Garg
79b422c0a9
fix: Advance TDS in TDS payable monthly report
2021-05-25 17:33:59 +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
Deepesh Garg
c9aa726818
feat: Tax deduction against advance payments
2021-05-25 17:17:40 +05:30
Anuja P
3efd411ddb
fix: Hold status is added in the report
2021-05-25 16:24:01 +05:30
Suraj Shetty
45bc14408e
refactor: Remove redundant variables.scss import
2021-05-25 15:57:33 +05:30
Suraj Shetty
d3b9edd2c4
fix: Remove unnecessary import
2021-05-25 12:52:26 +05:30
Suraj Shetty
b14a935c5d
Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing
2021-05-25 11:02:03 +05:30
Deepesh Garg
09d9bd19ac
Merge pull request #25816 from deepeshgarg007/jv_diff_ignore_v13
...
fix: Ignore rounding diff while importing JV using data import
2021-05-25 10:59:50 +05:30
rohitwaghchaure
bc7c5bfbe2
Merge pull request #25817 from rohitwaghchaure/fix-removed-serial-no-validate-for-sales-invoice
...
fix: removed serial no validation for sales invoice
2021-05-25 10:40:46 +05:30
Suraj Shetty
2f8a742aa8
refactor: Replace render imports
2021-05-25 10:28:32 +05:30
Rohit Waghchaure
b4f0347c02
fix: removed serial no validation for sales invoice
2021-05-24 23:39:25 +05:30
Deepesh Garg
7c0383a9a6
Merge pull request #25815 from deepeshgarg007/cash_flow_mapper_v13
...
fix: Cashflow mapper not showing data
2021-05-24 20:40:07 +05:30
Anurag Mishra
5670cf4386
feat: enhancements in Training Event ( #25782 )
...
* feat: Some Minor fixes
* fix: patch file
* fix: patch
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-05-24 20:24:20 +05:30
Deepesh Garg
25112244ed
fix: Ignore rounding diff while importig JV using data import
2021-05-24 20:01:21 +05:30
Deepesh Garg
c348215f61
fix: Cashlfow mapper not showing data
2021-05-24 19:57:53 +05:30
Deepesh Garg
63e4ab4f2d
Merge pull request #25777 from Anuja-pawar/fix-process-SOA-format
...
fix: Process Statement of Accounts formatting
2021-05-24 19:55:21 +05:30
Saqib
dd5b31f8c4
fix: set disable rounded total if it is globally enabled ( #25789 )
2021-05-24 18:23:03 +05:30
Saqib
b6d061fa8c
fix(pos): handle db lock timeout error while pos closing ( #25813 )
2021-05-24 18:22:03 +05:30
Ankush Menat
15f8a0fb22
test: fix flaky test
2021-05-24 17:55:39 +05:30
Ankush Menat
3aed662f46
chore: translation / semgrep / sider fixes
2021-05-24 17:55:39 +05:30
Ankush Menat
c15fef571f
test: item naming series behaviour
2021-05-24 17:55:39 +05:30
Ankush Menat
76dd6e9046
test: contextmanager to change settings
2021-05-24 17:55:39 +05:30
Ankush Menat
42e057d079
test: add test for get_timeline_data in item
2021-05-24 17:55:38 +05:30
Ankush Menat
e971b4592e
test: add test for is_stock_item
2021-05-24 17:55:38 +05:30
Ankush Menat
57266a7343
refactor: check_stock_uom_with_bin
2021-05-24 17:55:38 +05:30
Ankush Menat
fc54cf68ac
test: add tests for checking stock_uom with bin
2021-05-24 17:55:38 +05:30
Ankush Menat
4e360f805f
test: hoist defaults to function signature
2021-05-24 17:55:38 +05:30
Ankush Menat
eb17732876
test: add test for item attribute completion
2021-05-24 17:55:37 +05:30
Ankush Menat
f5a937bc45
test: check index creation on item table
2021-05-24 17:55:37 +05:30
Ankush Menat
b9fa12d572
test: add tests for uom conversion function
2021-05-24 17:55:37 +05:30
Ankush Menat
019be66b7b
fix: consider all UOMs for intermediate conversion
...
- Using `get_value` will restrict intermediate UOM to first UOM that is
found.
- A self join is required to truly capture the required behaviour.
- Add explanation and examples.
2021-05-24 17:55:37 +05:30
Ankush Menat
0d7f54c6c2
refactor: simplify UOM conversion logic
...
- Remove unnecessary sql query
- Remove convoluted matching logic and be explcitiy while querying.
- better variable names for understanding matching cases
2021-05-24 17:55:37 +05:30
Ankush Menat
297dc5e345
perf: add basic optimisation for uom conversion
2021-05-24 17:55:37 +05:30
Ankush Menat
958d485ba4
refactor: msgprint(raise_exception)->frappe.throw
2021-05-24 17:55:36 +05:30
Ankush Menat
ccbde0efa0
refactor: use enumerate instead of trackign index
...
also removed dead code
2021-05-24 17:55:36 +05:30
Ankush Menat
44c489223b
chore: remove py2 compat code
2021-05-24 17:55:18 +05:30
Jannat Patel
dc7afa743c
fix: profitability test ( #25812 )
...
* fix: profitability test
* fix: replaced class method
* fix: removed print statement
2021-05-24 17:33:48 +05:30
noahjacob
bf1b3b89d1
refactor: updated conditional visibility of check box
2021-05-24 17:03:15 +05:30
rohitwaghchaure
6809ff4f64
Merge pull request #25776 from rohitwaghchaure/fixed-warehouse-not-found-issue
...
fix: warehouse not found in stock entry
2021-05-24 17:00:06 +05:30
Nabin Hait
9b912b6adc
Merge branch 'version-13' into develop
2021-05-24 16:45:27 +05:30
Nabin Hait
10085580c8
bumped to version 13.3.1
2021-05-24 17:05:27 +05:50
Saqib
6368c976c7
fix: expected amount in pos closing payments table ( #25737 )
2021-05-24 16:44:38 +05:30
marination
c12264f6bc
chore: Cleanup Customer and Supplier Details section in Stock Entry
...
- Changed depends on value to "Send to Subcontractor" for supplier fields
- Removed Customer fields as they are not relevant to any Stock Entry purpose
- Renamed section to "Supplier Details" visibe on subcontracting transfer
2021-05-24 13:20:22 +05:30
rohitwaghchaure
ce88c945cd
Update stock_entry.js
2021-05-24 11:53:27 +05:30
krishnagirishp
5457db0601
chore: remove uses of six.PY2 in codebase ( #25062 )
...
* remove uses of six.py2 in codebase
* changes based on pr feedback
* Update amazon_mws_api.py
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-05-23 21:13:44 +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
Ankush Menat
c229ac9322
refactor: add guard clause for readability
...
Both functions only execute based on a condition. In such cases
condition should immediately exit the function, this is called "guard
clause" and helps in readability (less indent, and easy to "exit" when
reading the code.
2021-05-23 16:31:29 +05:30
Ankush Menat
4b484d741d
refactor: use is_new() instead of __islocal
...
Interface over implementation.
2021-05-23 16:31:29 +05:30
Ankush Menat
931c886f92
fix: not checking all fields
...
`break` will break out of the loop without checking remaining fields.
2021-05-23 16:31:29 +05:30
Ankush Menat
83e6e2e68a
refactor: add guard clause for readability
2021-05-23 16:31:29 +05:30
Ankush Menat
0b4858d8e5
refactor: eliminate unnecessary loop, container casts
2021-05-23 16:31:29 +05:30
Ankush Menat
ad58a8164a
refactor: code cleanup
...
minor fixes for improving code quality
2021-05-23 16:31:29 +05:30
Ankush Menat
4a2dbd4885
refactor: cleanup get_timeline_data, remove py2
2021-05-23 16:31:28 +05:30
Ankush Menat
330353a5ce
refactor: use frappe.throw instread of recreating
...
_msgprint was basically duplicating behvaiour of frappe.throw
2021-05-23 16:31:16 +05:30
Suraj Shetty
c0bad3d138
Merge pull request #25804 from surajshetty3416/fix-email-style
2021-05-23 13:42:19 +05:30
Suraj Shetty
540c82712a
Merge pull request #25803 from surajshetty3416/fix-extend-cscript
2021-05-23 13:39:09 +05:30
Suraj Shetty
815aad1003
fix: Rename email.bundle to erpnext_email.bundle
...
to avoid override of frappe email styles
2021-05-23 13:31:54 +05:30
Deepesh Garg
8a82b89308
Merge pull request #25772 from deepeshgarg007/support_settings_query
...
fix: Check if user can read before querying Support Settings
2021-05-22 20:17:21 +05:30
Marica
eaf0465c44
Merge pull request #25797 from marination/item-variants-report
...
fix: Item Variant Details Report
2021-05-22 19:05:54 +05:30
Rucha Mahabal
59961f70ee
refactor: timesheet
2021-05-22 10:21:04 +05:30
marination
b0019bcf5b
fix: Item Variant Details Report
...
Co-authored-by: gavindsouza <gavin18d@gmail.com>
- Handling of variants with special characters
- Set data in appropriately named columns
- Code cleanup
2021-05-21 21:42:11 +05:30
rohitwaghchaure
ab34f5b485
Merge pull request #25742 from ankush/disable_submit_btn
...
fix: duplicate stock entry on multiple click
2021-05-21 18:13:01 +05:30
rohitwaghchaure
579a1b7028
Merge pull request #25779 from ankush/parallel_stock_transactions
...
fix: wrong quantity after transaction for parallel stock transactions
2021-05-21 18:11:34 +05:30
Suraj Shetty
3e6cc5037b
fix: Remove unnecessary code
2021-05-21 17:37:19 +05:30
Suraj Shetty
81d49e9c71
fix: Use extend_cscript function to properly extend class methods to cscript
2021-05-21 17:03:09 +05:30
Saqib
0b5e340b6e
fix(pos): return case for item with available qty equal to one ( #25760 )
2021-05-21 16:32:56 +05:30
Saqib
e930456be2
fix(e-invoicing): 'NoneType' object is not iterable ( #25781 )
2021-05-21 16:31:12 +05:30
Alan
1097dc89c5
fix: show allow zero valuation only when auto checked ( #25778 )
2021-05-21 14:04:03 +05:30
Ankush Menat
4dcac4ae81
refactor(minor): Use identity instead of equality
...
Ignore false positive.
2021-05-21 13:49:58 +05:30
Ankush Menat
9979cf5fcc
fix: wrong quantity after transaction for parallel stock transactions
...
When two transactions are inserted parallelly then previous SLE could be
incorrect for some of them. Locking SLE table would prevent reading from
it till transaction is complete.
2021-05-21 12:31:06 +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
Rohit Waghchaure
795909fdcd
fix: warehouse not found in stock entry
2021-05-21 11:31:01 +05:30
Anuja P
605ea044f3
fix: update process SOA format
2021-05-21 11:24:33 +05:30
rohitwaghchaure
94a52c0e17
Merge pull request #25752 from rohitwaghchaure/fixed-do-not-repost-if-scheduler-is-in-running
...
fix: the status of repost item valuation showing In Progress since long time
2021-05-21 09:50:33 +05:30
rohitwaghchaure
84730aa4a5
Merge pull request #25754 from rohitwaghchaure/fixed-do-not-repost-if-scheduler-is-in-running-13
...
fix: the status of repost item valuation showing In Progress since long time
2021-05-21 09:50:18 +05:30
Rucha Mahabal
722cfdb7e5
Merge pull request #25701 from anupamvs/timesheet-refactor
...
refactor: timesheet
2021-05-20 23:43:19 +05:30
Deepesh Garg
6a1e31c633
fix: Check if user can rread before querying Support Settings
2021-05-20 23:16:22 +05:30
Rucha Mahabal
a7d0dbb085
fix: calculate total billing amount on fetching timesheets
...
- show timesheet billing amounts in doc currency
2021-05-20 23:02:11 +05:30
Rucha Mahabal
8a407f1ec3
fix: sider issues
2021-05-20 22:23:44 +05:30
Rucha Mahabal
be247ec3de
fix: error message placeholders and sider issues
2021-05-20 22:17:20 +05:30
Rucha Mahabal
0d8b9a9d0a
fix(patch): billable field not renamed
2021-05-20 19:53:30 +05:30
noahjacob
f0e6a16910
test: updated test for generated schedule dates
2021-05-20 19:29:12 +05:30
Deepesh Garg
181c5d240b
Merge pull request #25767 from deepeshgarg007/gst-ptach-fix-1
...
fix: Do not throw error on migrate
2021-05-20 18:40:48 +05:30
Mohammad Hasnain Mohsin Rajan
21e662f678
fix: apply permission while selecting projects ( #25765 )
2021-05-20 17:20:05 +05:30
Deepesh Garg
4427390ab3
fix: Do not throw error in migrate
2021-05-20 17:19:24 +05:30
Deepesh Garg
42e0692a81
Merge pull request #25704 from CaseSolvedUK/workspace-onlyfor-v13
...
fix: filter for Indian workspace card
2021-05-20 17:10:29 +05:30
noahjacob
0169cd845a
fix: sider
2021-05-20 15:40:07 +05:30
Anupam
1270febfff
fix: sider issues
2021-05-20 14:15:58 +05:30
Anupam
aa516e5d17
fix: review changes
2021-05-20 14:12:18 +05:30
Anupam
aeb88385bb
patch: timesheet changes
2021-05-20 14:11:36 +05:30
noahjacob
08598238d7
refactor: suggested changes
2021-05-20 13:23:10 +05:30
Deepesh Garg
8bc90ffcf5
Merge pull request #25755 from nextchamp-saqib/improve-missing-cost-center-msg
...
fix: missing cost center message on creating gl entries
2021-05-20 11:20:43 +05:30
Deepesh Garg
9de1a45185
Merge pull request #25699 from Anuja-pawar/fix_process_statement_report
...
fix: Process Statement of Accounts formatting
2021-05-19 19:21:43 +05:30
Saqib Ansari
b9ad385232
fix: remove uncessary query
2021-05-19 19:13:06 +05:30
Saqib Ansari
7fb385a89f
fix: cannot bypass e-invoicing for non gst item invoices
2021-05-19 18:47:06 +05:30
Saqib
4bd641367b
fix: address template with upper filter throws jinja error ( #25756 )
2021-05-19 16:38:53 +05:30
noahjacob
516c789127
refactor: variable names and suggested changes
2021-05-19 16:01:39 +05:30
Suraj Shetty
5c6d3e043c
test: Replace usage of render with get_response
2021-05-19 15:33:58 +05:30
Anupam
4e73c8a79f
restructuring timesheet fields
2021-05-19 14:58:12 +05:30
noahjacob
bf7f0530e6
fix: added error handling if entry already exists
2021-05-19 13:53:22 +05:30
noahjacob
8e34c49ac9
refactor: using get_all instead of get_list
2021-05-19 13:51:36 +05:30
noahjacob
3768216dca
refactor: updated permissions and mandatory fields
2021-05-19 13:50:35 +05:30
Saqib Ansari
f79ef5d8cf
fix: missing cost center message on creating gl entries
2021-05-19 13:04:44 +05:30
Rohit Waghchaure
5456873641
fix: run scheduler for reposting if there is no scheduler is running for the reposting
2021-05-19 12:30:28 +05:30
Faris Ansari
1483a60b90
fix: super call syntax error
2021-05-19 12:30:11 +05:30
Deepesh Garg
d15d0d8568
Merge pull request #25254 from CaseSolvedUK/taxdetail-v13
...
feat: Tax Detail Report
2021-05-18 22:45:29 +05:30
Anupam
9bd779401d
added multi-currency fields
2021-05-18 22:41:28 +05:30
anushka19
90f7ec840c
fix: Accumulated depreciation ( #25748 )
...
* fix: Accumulated depreciation
* fix: Sider issues
2021-05-18 22:21:42 +05:30
Saqib
8d7d4b0ba7
fix: expected amount in pos closing payments table ( #25737 )
2021-05-18 18:39:35 +05:30
Syed Mujeer Hashmi
426b04003c
fix: Project filter for Kanban Board
...
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
2021-05-18 17:02:21 +05:30
anushka19
0fb6f9306f
fix: Accumulated depreciation ( #25740 )
...
* fix: Accumulated depreciation
* fix: Sider issues
2021-05-18 17:00:33 +05:30
Marica
814fd19424
Merge pull request #25732 from noahjacob/ux_landed_cost_voucher
...
refactor: updated applicable charges form in landed cost voucher
2021-05-18 16:39:31 +05:30
Ankush Menat
ecbb8cbc84
revert: "fix: duplicate stock entry ( #25486 )"
...
Not required anymore, submit button is disabled.
2021-05-18 16:35:55 +05:30
Ankush Menat
042b8524cc
fix: disable submit button to avoid multiple calls
2021-05-18 16:35:49 +05:30
Marica
5da34bddd6
Merge pull request #25731 from ankush/escaping_company_name
...
fix: escape company name
2021-05-18 16:35:19 +05:30
Devin Slauenwhite
bdba064fa6
fix: duplicate stock entry ( #25486 )
...
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-05-18 16:12:53 +05:30
prssanna
60ea785dfd
fix: ensure website theme is applied correctly
2021-05-18 15:42:13 +05:30
noahjacob
0ab0fcdd51
feat: added supplier item group link in supplier dashboard
2021-05-18 15:21:24 +05:30
noahjacob
ca2fb47d44
feat: updates item_code filters if item_group is linked to supplier
2021-05-18 15:01:05 +05:30
Suraj Shetty
a83d2aacd9
Merge branch 'develop' into esbuild
2021-05-18 14:48:28 +05:30
Ankush Menat
b6783b158f
chore: translation fixes
2021-05-17 17:06:41 +05:30
Ankush Menat
f3b3d81e0b
fix: escape company name in deferred_revenue
2021-05-17 17:06:41 +05:30
noahjacob
41ac8be6f2
refactor: base_amount field moved below amount field and renamed
2021-05-17 13:58:27 +05:30
Rohit Waghchaure
0517abad43
fix: run scheduler for reposting if there is no scheduler is running for the reposting
2021-05-17 13:31:12 +05:30
Nabin Hait
8b2fef11b1
fix: merge conflict
2021-05-17 11:37:14 +05:30
Nabin Hait
bc92ecb10f
bumped to version 13.3.0
2021-05-17 11:56:29 +05:50
Anupam
42d2f663fa
fix: sider fixes
2021-05-17 11:08:26 +05:30
Nabin Hait
9ec0f11800
fix: renamed change log
2021-05-17 10:50:42 +05:30
Nabin Hait
2f403f1bcd
fix: renamed change log
2021-05-17 10:50:26 +05:30
Nabin Hait
ad0b8fdd1e
chore: Added change log for v13.3.0
2021-05-17 10:49:21 +05:30
Deepesh Garg
87baa646e7
Merge pull request #25260 from AfshanKhan/dimension-wise-accounts-balance-reports
...
feat: Dimension-wise Accounts Balance Report
2021-05-16 18:04:01 +05:30
Anupam
35137ba9e0
removing currency filter and added rate conversion while fetching timesheets in SI
2021-05-16 14:17:56 +05:30
Anupam
cab998c293
adding patch
2021-05-15 20:40:20 +05:30
Anupam
fd4743cc31
refactor: timesheet
2021-05-15 20:01:17 +05:30
Alan
55c2fec683
feat: add pending qty section to batch/serial selector dialog ( #25519 )
...
* feat: add pending qty section to batch/serial selector dialog
* fix: call attach in setup and refresh, fix conditional
* refactor: camel to snake casing
2021-05-14 12:36:41 +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
Alan
98fc4195b3
fix: send emails on rfq submit ( #25695 )
...
* fix: send emails on rfq submit
* fix: check if email is present for supplier
2021-05-14 12:22:28 +05:30
Alan
eca86290bc
fix: show uom for item in selector dialog ( #25697 )
2021-05-14 12:21:38 +05:30
Deepesh Garg
be3cde9313
chore: Code clean up for purchase receipt GL ( #25379 )
...
* chore: Code clean up for purchase receipt GL
* fix: add params for debit and credit in account curreny
* chore: Asset GL entry code cleanup
* fix: Syntax error
* fix: Update variable names
* fix: function naming
* fix: Add undefined variables
* fix: Supplier warehouse fetching
* fix: Linting issues
2021-05-14 12:20:38 +05:30
Deepesh Garg
55fe85d850
feat(India): Multiple GST enhancement and fixes ( #25249 )
...
* fix: RCM tax calculation
* feat(India): ITC Reversal via Journal Entry
* fix: Reverse Charge booking logic and validation
* fix: Addd patch for availed ITC fields
* fix: Hooks method to update availed ITC field
* fix: Cleanup and fixes in GSTR3B report
* fix: Update params in GSTR-1 report
* fix: Debit note using Sales Invoice
* fix: Setup and patch
* fix: GSTR 3B report cleanup and updates
* fix: Add method to get invoices liable to reverse charge
* fix: Add taxable value in Purchase Invoice Item
* fix: Inward supplies liable to reverse charge
* fix: Linting issues
* fix: GSTR3B report test
2021-05-14 12:17:41 +05:30
casesolved-co-uk
6ab46e288f
fix: workspace formatting due to manual edit and filter tweaks
2021-05-13 12:56:02 +00:00
casesolved-co-uk
d5256b60d4
fix: lint
2021-05-13 12:53:11 +00:00
casesolved-co-uk
6998786055
fix: use correct fiscal year function in testing
2021-05-13 12:53:11 +00:00
casesolved-co-uk
cf5b57bfac
fix: only load data for tests that need it
2021-05-13 12:53:11 +00:00
casesolved-co-uk
68a31d3d0d
fix: fiscal year error
2021-05-13 12:53:11 +00:00
casesolved-co-uk
75ebfbdaf3
fix: fiscal year test case issue
2021-05-13 12:53:11 +00:00
casesolved-co-uk
89fcdf3226
fix: exclude rounding GL Entries from invoice tax lines
2021-05-13 12:53:11 +00:00
casesolved-co-uk
06e31e5d7d
fix: Test data for empty db
2021-05-13 12:53:11 +00:00
casesolved-co-uk
391dc45964
chore: fix sider
2021-05-13 12:53:11 +00:00
casesolved-co-uk
7555f5f613
fix: add to workspace and fix lint
2021-05-13 12:53:11 +00:00
casesolved-co-uk
77ffa6b1f6
feat: add test case for report output
2021-05-13 12:53:11 +00:00
casesolved-co-uk
2cb0da8780
fix: rewrite to allow referring to existing sections and reduce to single amount column
2021-05-13 12:53:10 +00:00
casesolved-co-uk
1c37390899
fix: Change & simplify query to cater for zero rate tax entries
2021-05-13 12:53:10 +00:00
casesolved-co-uk
442a0de094
fix: finalise query, fix bugs, put Add Columns back
2021-05-13 12:53:10 +00:00
casesolved-co-uk
ece00287ea
Refactor for Journal Entries (payroll)
2021-05-13 12:53:10 +00:00
casesolved-co-uk
3027cc7da6
fix: minor bug and tidy
2021-05-13 12:53:10 +00:00
casesolved-co-uk
5d9217ab29
fix: minor bugs and improvements
2021-05-13 12:53:10 +00:00
casesolved-co-uk
8e413651c2
fix: major refactor to monkey-patch into the QueryReport class
2021-05-13 12:53:10 +00:00
casesolved-co-uk
dba4b3cd13
feat: add run mode, add tests, various fixes
2021-05-13 12:53:10 +00:00
Richard Case
ef8ab135c9
develop: progress tax detail report
2021-05-13 12:53:10 +00:00
casesolved-co-uk
a5d47f70b8
Fleshed out report setup functionality
2021-05-13 12:53:10 +00:00
casesolved-co-uk
3503598735
Initial commit of Tax Detail report and report builder
2021-05-13 12:53:10 +00:00
rohitwaghchaure
ba940bb9e1
Merge pull request #25702 from rohitwaghchaure/change-today-to-now-for-reposting
...
fix: change today to now to get data for reposting
2021-05-13 17:44:38 +05:30
rohitwaghchaure
0048418c46
Merge pull request #25703 from rohitwaghchaure/change-today-to-now-for-reposting-pre
...
fix: change today to now to get data for reposting
2021-05-13 17:44:27 +05:30
rohitwaghchaure
fc44478810
Update repost_item_valuation.py
2021-05-13 17:42:33 +05:30
Rohit Waghchaure
a0a88a710e
fix: change today to now to get data for reposting
2021-05-13 17:42:06 +05:30
casesolved-co-uk
aca8c34c4d
fix: filter for Indian workspace card
2021-05-13 12:11:41 +00:00
Rohit Waghchaure
af1376c1df
chore: change today to now to get data for reposting
2021-05-13 17:39:49 +05:30
Mohammad Hasnain Mohsin Rajan
e85770fe3f
fix: bank statement import via google sheet ( #25676 )
...
* fix: google sheet bank statement import
* fix: quotes
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
* chore: add translation
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
* chore: grammar
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
* fix: remove comment
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2021-05-13 17:33:18 +05:30
Mohammad Hasnain Mohsin Rajan
7c6de1a8ac
fix: bank statement import via google sheet ( #25677 )
...
* fix: change links in workspace
* fix: google sheet bank statement import
* chore: quotes
* fix: capitalization
* fix: typo
* chore: add translation
2021-05-13 17:28:49 +05:30
rohitwaghchaure
d42dd5d868
Merge pull request #25694 from rohitwaghchaure/fixed-warehouse-tree-time-out-error-13hotfix
...
fix: timeout error while loading warehouse tree
2021-05-13 17:21:16 +05:30
Anuja Pawar
b28889c6f7
Merge branch 'develop' into fix_process_statement_report
2021-05-13 16:23:06 +05:30
Rohit Waghchaure
27f50d5852
fix: timeout error while loading warehouse tree
2021-05-13 15:54:35 +05:30
Suraj Shetty
14ca9ce1b7
Merge pull request #25635 from surajshetty3416/parallel-distributed-testing
2021-05-13 15:41:13 +05:30
Deepesh Garg
8e748f8451
fix: Parameter for get_filtered_list_for_consolidated_report in consolidated balance sheet
2021-05-13 15:21:51 +05:30
Anuja P
e90a2a346b
fix: update new changes
2021-05-13 15:15:47 +05:30
Deepesh Garg
95e05fbdac
fix: Parameter for get_filtered_list_for_consolidated_report in consolidated balance sheet
2021-05-13 14:59:28 +05:30
Anuja P
554c91d638
fix: solved conflicts
2021-05-13 14:48:38 +05:30
Anuja P
ab1ae418cc
fix: Process SOA enhancement
2021-05-13 14:26:27 +05:30
Anurag Mishra
0c482fde5f
feat: Leave Policy Assignment Refactor ( #24327 )
...
* feat: Leave Policy Assignment Refactor
* fix: Changes Requested
* fix: sider
* fix: changes requested
* test: fixed
* test: fixed wrong set query
* fix: remove commented code
* fix(style): extra space
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-05-13 13:20:14 +05:30
Prssanna Desai
0eb3a38c9d
fix: quiz evalutation issue ( #25671 )
2021-05-13 12:17:28 +05:30
David Angulo
c55aa295fc
fix: Translate weekday when getting weekly off dates ( #25691 )
2021-05-13 12:16:04 +05:30
rohitwaghchaure
c29c6ff9a7
Merge pull request #25692 from rohitwaghchaure/fixed-woocommerce-order-sync-issue-pre
...
fix: Woocommerce order sync issue
2021-05-12 23:09:33 +05:30
Rohit Waghchaure
fe68a0ff80
fix: Woocommerce order sync issue
2021-05-12 23:08:16 +05:30
rohitwaghchaure
0612300631
Merge pull request #25688 from rohitwaghchaure/fixed-woocommerce-order-sync-issue
...
fix: Woocommerce order sync issue
2021-05-12 23:07:46 +05:30
Rohit Waghchaure
c3c54fe058
fix: Woocommerce order sync issue
2021-05-12 19:42:04 +05:30
Suraj Shetty
75909f061c
Merge branch 'develop' into parallel-distributed-testing
2021-05-12 18:14:49 +05:30
rohitwaghchaure
3c79ee3a2b
Merge pull request #25672 from rohitwaghchaure/fixed-don-not-mao-set-warehouse
...
fix: don't map set warehouse from delivery note to purchase receipt
2021-05-12 17:47:28 +05:30
Afshan
dc205e805f
fix: Dialog variable assignment after definition in POS ( #25681 )
2021-05-12 17:42:06 +05:30
Afshan
6578c045ca
fix: Dialog variable assignment after definition in POS ( #25680 )
2021-05-12 17:41:50 +05:30
rohitwaghchaure
4fbabb4132
Merge pull request #25679 from rohitwaghchaure/fixed-new-fields-not-added
...
fix: updated modified time in purchase invoice to pull new fields
2021-05-12 16:40:23 +05:30
rohitwaghchaure
4ec0656f64
Merge pull request #25678 from rohitwaghchaure/fixed-new-fields-not-added-pre
...
fix: updated modified time in purchase invoice to pull new fields
2021-05-12 16:39:35 +05:30
Rohit Waghchaure
aaca8335f0
fix: updated modified time to pull new fields
2021-05-12 16:36:25 +05:30
Rohit Waghchaure
9f017a351b
fix: updated modified time to pull new fields
2021-05-12 16:35:19 +05:30
Mohammad Hasnain Mohsin Rajan
e7a2fdd81a
fix: change links in workspace ( #25674 )
2021-05-12 13:02:32 +05:30
Mohammad Hasnain Mohsin Rajan
dd1822ef58
fix: change links in workspace ( #25673 )
2021-05-12 13:01:53 +05:30
Mohammad Hasnain Mohsin Rajan
af8436d0dc
fix: change links in workspace ( #25670 )
2021-05-12 13:01:03 +05:30
Rohit Waghchaure
d984be0ccd
fix: don't map set warehouse from delivery note to purchase receipt
2021-05-12 12:32:14 +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
a665f14620
fix: Error on adding bank account to plaid ( #25658 )
2021-05-11 17:33:59 +05:30
Deepesh Garg
a60c3081cf
fix: Breaking cost center validation
2021-05-11 16:38:33 +05:30
Nabin Hait
e38192cb6d
fix: merge conflict
2021-05-11 11:15:09 +05:30
Suraj Shetty
b76ebb3f4b
fix: Use frappe.safe_eval instead of eval
2021-05-11 10:59:16 +05:30
Deepesh Garg
d2520680bc
fix: Error on applying TDS without party ( #25632 )
...
* fix: Error on applying TDS without party
* fix: Add placeholder value
2021-05-10 21:17:06 +05:30
Suraj Shetty
b3fadebb41
style: Fix sider issues
2021-05-10 20:49:07 +05:30
Suraj Shetty
a13c453c69
test: Fix a case where test used to fail due to holiday list
...
- fixes: "Please set a default Holiday List for Employee EMP-00009 or Company Wind Power LLC" error
2021-05-10 20:33:47 +05:30
Suraj Shetty
404e7d07c5
test: Fix permission error
2021-05-10 18:39:09 +05:30
Deepesh Garg
83f98f6992
Merge pull request #25653 from deepeshgarg007/tax_labels
...
fix: Client script breaking while settings tax labels
2021-05-10 18:24:02 +05:30
Suraj Shetty
018ccc2b6d
test: Fix test name
...
- Rename TestSubcontractedItemToBeReceived > TestSubcontractedItemToBeTransferred
2021-05-10 18:01:53 +05:30
Suraj Shetty
4d6d5f4d89
test: Fix valuation rate for raw materials
2021-05-10 17:37:44 +05:30
Suraj Shetty
a132de42ca
fix: allow_zero_valuation_rate for rejected qty
2021-05-10 17:25:21 +05:30
Deepesh Garg
9f0823a164
fix: Linting issues
2021-05-10 16:07:41 +05:30
Saqib
55d47a2baa
fix(pos): UI fixes related to overflowing payment section ( #25652 )
...
* fix: additional fields overflowing in payment section
* fix: pos profile filter in pos opening dialog
* fix: item quantity pill
2021-05-10 15:59:37 +05:30
Deepesh Garg
13dfb9734c
fix: Lable for transaction child tables
2021-05-10 15:38:32 +05:30
Deepesh Garg
1a48eb49cf
fix: Client script breaking while settings tax labels
2021-05-10 14:37:10 +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
Ankush Menat
6e179c3092
fix: sync shopify customer addresses ( #25481 )
2021-05-10 13:24:26 +05:30
Saqib
9226cd3932
feat(india): reduced rate of depreciation as per IT Act ( #25648 )
...
* feat(india): reduced rate of depreciation as per IT Act
* refactor: check date difference instead of month difference
* feat: add test for regional feature
2021-05-10 12:36:56 +05:30
Suraj Shetty
ec6b652cd4
refactor: Rename assertEquals to assertEqual to avoid deprecation warnings
2021-05-10 09:18:25 +05:30
noahjacob
50f52dfbcb
refactor: variable names and refactored cancel function into submit function
2021-05-09 20:04:06 +05:30
noahjacob
7715441842
feat: added supplier item group doctype
2021-05-09 20:02:23 +05:30
Suraj Shetty
2ac27d774d
test: Fix test dependency
2021-05-09 14:38:28 +05:30
Suraj Shetty
142ec9e99e
test: Pass ConflictingTaxRule during tax rule test
2021-05-08 19:03:53 +05:30
Ganga Manoj
aa9e172091
feat: Add Create Expense Claim button in Delivery Trip ( #25526 )
...
* feat(Delivery Trip): Add employee_code field
* feat(Expense Claim): Add Delivery Trip Number field
* feat(Delivery Trip): Add Create Expense Claim button
* feat(Delivery Trip): Make Create Expense Claim button show up after save
* fix(Delivery Trip): Fix Sider issues
* fix(Delivery Trip): Display button after submit
* fix(Delivery Trip & Expense Claim): Rename new fields
* fix(Delivery Trip): Add button in refresh
* fix(Delivery Trip): Remove redundant line
* fix(Expense Claim): Display delivery_trip only if non-empty
* fix(Delivery Trip): Add test for Create Expense Claim
* fix(Delivery Trip): Fix Sider Issue
* fix(Delivery Trip): Only display Create Expense Claim if the driver is an employee
* fix(Delivery Trip): Fix test
* fix(Delivery Trip): Fix make_expense_claim()
* fix: sider
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-05-08 17:15:33 +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
rohitwaghchaure
64bd4f27b8
Merge pull request #25611 from rohitwaghchaure/validation-to-check-duplicate-serial-nos
...
fix: added validation in stock entry to check duplicate serial nos
2021-05-07 23:30:27 +05:30
rohitwaghchaure
42fe07bd19
Merge pull request #25551 from rohitwaghchaure/fixed-total-stock-summary-report
...
fix: total stock summary report not working
2021-05-07 23:30:06 +05:30
rohitwaghchaure
1726ce547c
Merge pull request #25471 from rohitwaghchaure/allow-to-receipt-same-serial-no
...
fix: allow to receive same serial numbers multiple times
2021-05-07 23:27:50 +05:30
Alan
c6dc9eaf2e
feat!: add pick batch button ( #25413 )
...
* feat!: add pick batch button
BREAKING CHANGE: replaces setup_serial_no with setup_serial_or_batch_no.
* refactor: use setup_serial_or_batch_no instead of setup_serial_no
* refactor: use setup_serial_or_batch_no instead of setup_serial_no
* refactor: use setup_serial_or_batch_no instead of setup_serial_no
* style: add sider review changes
* refactor: make consice, extract function
* refactor: camel to snake casing
2021-05-07 20:30:04 +05:30
Ankush Menat
90e671905a
chore: replace assertEquals with alias assertEqual ( #25613 )
...
* chore: replace assertEquals with alias assertEqual
assertEquals has been deprecated.
ref: https://docs.python.org/3/library/unittest.html#deprecated-aliases
* chore: sider fixes
2021-05-07 20:28:51 +05:30
Ankush Menat
e28165ea87
fix: force https for shopify webhook registration ( #25630 )
2021-05-07 20:27:51 +05:30
Anupam Kumar
da7fefe29d
fix: timesheet filter date exclusive issue ( #25626 )
2021-05-07 20:26:50 +05:30
Faris Ansari
f97cc0367b
fix: initialize filters in constructor
2021-05-07 15:32:06 +05:30
Faris Ansari
69eb6d476e
Merge remote-tracking branch 'upstream/develop' into esbuild
2021-05-07 15:21:33 +05:30
Faris Ansari
464d838447
fix: Update bundle paths
2021-05-07 14:53:42 +05:30
Faris Ansari
ff3b71d2e7
fix: Make css bundles
2021-05-07 14:52:13 +05:30
Faris Ansari
f751738267
fix: Make js bundles
2021-05-07 14:51:05 +05:30
Saqib
27cf19a19f
feat(pos): show POS reserved stock in stock projected qty report ( #25593 )
...
* feat(pos): consider POS reserved stock in stock projected qty report
* chore: remove unwanted string formats
2021-05-07 13:37:42 +05:30
Ganga Manoj
5618ce3852
fix(Material Request): Add 'Partially Received' to Status drop-down list ( #24857 )
...
Co-authored-by: Ganga Manoj <ganga_manoj@Gangas-MacBook-Air.local>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-05-07 13:35:09 +05:30
Syed Mujeer Hashmi
bcf3f3dd29
fix: Monthly Attendance Sheet Summarized view ( #24976 )
...
* fix: Monthly Attendance Sheet Summarized view
This fixes the count of different leave types in the monthly
attendance sheet summarized view.
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
* fix: Avoid using raw sql query
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2021-05-07 13:34:21 +05:30
HENRY Florian
3ecd7ac4c7
fix: Add french chart accounts with account number ( #25009 )
...
* fix: Add french chart accounts with account number
* fix actual franch plan
2021-05-07 13:33:12 +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
Umair Sayed
7f79d463f6
fix: Stock and Accounts Settings form refactor ( #25534 )
...
* stock and accounts settings page
* fix: Stock and accounts settings page cleanup
Co-authored-by: Umair Sayed <umairsayed@Umairs-MacBook-Air.local>
2021-05-07 12:28:57 +05:30
Shariq Ansari
735fbdc350
fix: Updating Standard Notification's channel field ( #25564 )
2021-05-07 12:26:32 +05:30
Shariq Ansari
ad3edc83ec
fix: Render timesheet template on timer field ( #25565 )
...
* fix: Render timesheet template on timer field
* fix: sider fix
2021-05-07 12:25:40 +05:30
Deepesh Garg
00e00e4e90
fix: Report summary showing inflated values when values are accumulated in Group Company ( #25577 )
...
* fix: Report summary showing inflated values when values are accumullated in Group Company
* fix: Remove extra space
* fix: Translate strings
* fix: Remove unintended changes
2021-05-07 12:16:44 +05:30
Shadrak Gurupnor
f648d2d7c4
fix: added tax_types list ( #25587 )
2021-05-07 12:15:19 +05:30
Ankush Menat
996f7e53a1
fix: update shopify api version ( #25600 )
2021-05-07 12:14:14 +05:30
Anuja Pawar
f132ed4335
fix: update item level cost center from POS ( #25609 )
2021-05-07 12:11:09 +05:30
Alan
0e0de6baa1
fix: prevent spurious defaults for items when making prec from dnote ( #25559 )
...
* fix: prevent spurious defaults for items when making prec from dnote
* refactor: make concise, use dict comp
2021-05-07 11:40:02 +05:30
Nikhil Ponnuru
ef9f126cb2
fix: change get_all to get_list in employee leave balance summary report to hide descendants when hide descendants is selected in user permissions ( #25599 )
...
Co-authored-by: nikhilponnuru <nikhil.kp@zerodha.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-05-07 10:06:29 +05:30
Noah Jacob
4ecae62194
fix: added is_stock_item filter ( #25530 )
2021-05-06 19:42:01 +05:30
Nabin Hait
7481f54e0c
Merge branch 'version-13' into develop
2021-05-06 19:18:18 +05:30
Nabin Hait
ae18efaa0a
bumped to version 13.2.1
2021-05-06 19:38:17 +05:50
Nabin Hait
0e41295c0e
perf: Performance enhancement on setup wizard ( #25606 )
...
* perf: Performance enhancement on setup wizard
* fix: create departments without updating nsm
2021-05-06 19:14:06 +05:30
Nabin Hait
134eaa5786
perf: Performance enhancement on setup wizard ( #25605 )
...
* perf: Performance enhancement on setup wizard
* fix: create departments without updating nsm
2021-05-06 19:13:54 +05:30
Suraj Shetty
c702408f99
chore: Remove unnecessary print statements
2021-05-06 18:37:45 +05:30
Suraj Shetty
bdf8c528f1
test: Fix dependencies
2021-05-06 18:37:14 +05:30
Rohit Waghchaure
695becdd05
fix: added validation in stock entry to check duplicate serial nos
2021-05-06 18:03:32 +05:30
Anurag Mishra
80c5c866db
Revert "fix: default value for Templates ( #25591 )" ( #25608 )
...
This reverts commit 60f3e9ee29
2021-05-06 17:45:58 +05:30
rohitwaghchaure
dc6233b703
Merge pull request #25541 from rohitwaghchaure/fixed-incorrect-serial-no-set
...
fix: serial no changed after saving stock reconciliation
2021-05-06 17:44:36 +05:30
Suraj Shetty
c5430afe2d
test: Fix test_dependencies
2021-05-06 17:44:26 +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
Deepesh Garg
daf6c124a9
fix: Check if payment schedule exists
2021-05-06 16:47:02 +05:30
Deepesh Garg
be66ee9723
fix: Check if payment schedule exits before updating label
2021-05-06 16:46:55 +05:30
Deepesh Garg
a0ed517c85
fix: function call to update payment schedule labels
2021-05-06 16:46:47 +05:30
Sagar Vora
f43a86d90f
perf: significant reduction in time taken to save a delivery note ( #25475 )
2021-05-06 16:40:06 +05:30
Saqib
d502f76319
feat(e-invoicing): e-way bill validity field ( #25555 )
2021-05-06 16:10:55 +05:30
Deepesh Garg
8a1f86db16
Merge pull request #25582 from deepeshgarg007/this_variable
...
fix: function call to update payment schedule labels
2021-05-06 15:50:47 +05:30
Deepesh Garg
9dd0a26e92
Merge pull request #25598 from deepeshgarg007/payment_reco_invoice_fix
...
fix: Invoices not getting fetched during payment reconciliation
2021-05-06 15:49:19 +05:30
rohitwaghchaure
7ed531611b
Merge pull request #25588 from 18alantom/fix-check-schedule-date
...
fix: check for None in item.schedule_date before setting
2021-05-06 14:04:14 +05:30
Suraj Shetty
c981969446
test: Fix dependency
2021-05-06 13:04:12 +05:30
Rohit Waghchaure
bb3e5d00f4
fix: allow to receive same serial numbers multiple times
2021-05-06 12:38:35 +05:30
Deepesh Garg
85b675a554
fix: Invoices not fetch during payment reconciliation
2021-05-05 20:57:31 +05:30
Anurag Mishra
60f3e9ee29
fix: default value for Templates ( #25591 )
2021-05-05 13:23:42 +05:30
Anurag Mishra
ca9599da51
Merge branch 'develop' into Employee-Referrals-ui-fix
2021-05-05 12:57:17 +05:30
Deepesh Garg
ffea9d4126
fix: Check if payment schedule exists
2021-05-05 12:28:40 +05:30
18alantom
136eb30081
fix: use get_serial_nos for splitting
2021-05-05 12:26:29 +05:30
Deepesh Garg
1bb7bb74ad
fix: Check if payment schedule exits before updating label
2021-05-05 12:19:57 +05:30
18alantom
2a20a03c28
fix: check for None in item.schedule_date before setting
2021-05-05 11:59:15 +05:30
Rohit Waghchaure
c432766a70
fix: stock reconciliation getting time out error during submission
2021-05-05 10:16:21 +05:30
rohitwaghchaure
8be414873b
Merge pull request #25575 from rohitwaghchaure/fixed-stock-balance-report-and-batchwise-report
...
fix: stock balance and batch-wise balance history report showing different closing stock
2021-05-05 10:04:23 +05:30
Deepesh Garg
04923d6a65
fix: function call to update payment schedule labels
2021-05-04 21:01:12 +05:30
Asharam Seervi
18ad15ed16
fix: designation insufficient permission on lead doctype. ( #25331 )
2021-05-04 19:28:07 +05:30
Hendy Irawan
05f9df6c10
fix(accounts): Get balance for Profit and Loss accounts, only including valid transactions (not cancelled)
...
Fixed #25572 Period Closing Voucher incorrect journal entry amount for
Income/Expenses Accounts containing canceled transactions.
2021-05-04 13:32:16 +00:00
Anurag Mishra
16da87a307
fix: created new section for deatils
2021-05-04 17:05:42 +05:30
Afshan
eebc6e9277
refactor: Show item's full name on hover over item in POS ( #25554 )
...
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-05-04 17:05:12 +05:30
Rushabh Mehta
5fc4f1e37d
Merge pull request #25238 from alyf-de/datev_fixes
...
feat: Improve DATEV export
2021-05-04 15:38:57 +05:30
Rohit Waghchaure
ba8dc1ffbd
fix: stock balance and batchwise balance history report showing different closing stock
2021-05-04 15:03:10 +05:30
Saqib
384f4b5b7e
fix: can't open general ledger from consolidated financial report ( #25542 )
2021-05-04 12:33:49 +05:30
Saqib
076020643d
fix: empty payment term column in accounts receivable report ( #25556 )
2021-05-04 12:26:49 +05:30
18alantom
308905b1be
fix: semgrep, refactor default mutable dict
2021-05-04 11:46:13 +05:30
18alantom
e36f303042
fix: use percent string templates for db.sql calls
2021-05-04 11:46:13 +05:30
barredterra
24e2cc9107
Merge branch 'develop' into datev_fixes
2021-05-03 18:19:28 +02:00
Suraj Shetty
ca37380d2e
Merge branch 'develop' of github.com:frappe/erpnext into develop
2021-05-03 19:44:22 +05:30
Rucha Mahabal
f1bdfac7a8
fix: Employee Separation ( #25503 )
...
* fix: Employee Separation
- add ignore_mandatory flag for project creation
- form clean-up
* fix: Employee Separation test
2021-05-03 18:37:00 +05:30
rohitwaghchaure
1f4df80565
Merge pull request #25531 from noahjacob/fix_mr_filter
...
fix: updated item filters for material request
2021-05-03 18:36:25 +05:30
rohitwaghchaure
88734eea14
Merge pull request #25557 from rohitwaghchaure/increased-timeout-of-stoc-reco
...
fix: stock reconciliation getting time out error during submission
2021-05-03 18:25:33 +05:30
Rohit Waghchaure
8f34ca4ac6
fix: stock reconciliation getting time out error during submission
2021-05-03 15:32:13 +05:30
Saqib
cdc99cdd49
fix(pos): incorrect expense account set in pos invoice ( #25543 )
2021-05-03 11:54:55 +05:30
rohitwaghchaure
9cc7c294e7
Update stock_reconciliation.py
2021-05-03 10:25:53 +05:30
Deepesh Garg
0ae702aab9
Merge branch 'develop' of https://github.com/frappe/erpnext into bootstraped_gst_setup
2021-05-02 22:37:04 +05:30
Deepesh Garg
84ec295b43
Merge pull request #25546 from deepeshgarg007/loan_schedule_fixes
...
fix: Minor fixes in loan
2021-05-02 22:35:34 +05:30
Deepesh Garg
1bac72b74d
fix: Add GST accounts to GST Settings
2021-05-02 22:29:48 +05:30
Deepesh Garg
72e602ae54
fix: Add validation for GST Settings
2021-05-02 18:22:29 +05:30
Rohit Waghchaure
6a5a380c07
fix: total stock summary report not working
2021-05-02 18:02:28 +05:30
Rohit Waghchaure
35d4829383
fix: serial no changed after saving stock reconciliation
2021-05-02 17:57:28 +05:30
rohitwaghchaure
5f177aaeaa
Merge pull request #25545 from rohitwaghchaure/fixed-depost-withdrwal-values-has-not-updated
...
fix: rename field has not updated value of deposit and withdrawal fields
2021-05-02 17:54:22 +05:30
Deepesh Garg
c571141c1f
fix: Test cases
2021-05-02 15:31:04 +05:30
Deepesh Garg
f6610c96dd
fix: Gracefully handle duplicate bank account name to make setup faster
2021-05-02 12:23:11 +05:30
Deepesh Garg
a66184fe3c
fix: Remove redundant get_doc
2021-05-02 12:22:16 +05:30
Deepesh Garg
824f089569
fix: Auto write off on loan closure
2021-05-01 22:07:13 +05:30
Deepesh Garg
1efafb3ce8
fix: Do not roundoff balance amount
2021-05-01 21:52:43 +05:30
Rohit Waghchaure
2fb573781d
fix: rename field has not updated value of deposit and withdrawal fields
2021-05-01 17:56:40 +05:30
Nabin Hait
0c7448fc41
fix: Fixed merge conflict
2021-05-01 14:54:22 +05:30
Nabin Hait
a2fcca85a5
fix: Fixed merge conflict
2021-05-01 14:53:13 +05:30
Nabin Hait
d8cd5a95cb
bumped to version 13.2.0
2021-05-01 15:12:44 +05:50
Nabin Hait
3c788f0325
chore: Add release note for v13.2.0
2021-05-01 14:42:30 +05:30
rohitwaghchaure
2e38f1514f
fix: stock ledger entry created against draft stock entry ( #25539 )
2021-05-01 13:53:46 +05:30
rohitwaghchaure
00ea336b52
fix: stock ledger entry created against draft stock entry ( #25540 )
2021-05-01 13:53:39 +05:30
Afshan
1fd1e2bb60
fix: fieldname when updating docfield property ( #25517 )
2021-04-30 18:41:26 +05:30
Afshan
5a4615fd4e
fix: allow to cancel loan with cancelled replayment entry ( #25508 )
2021-04-30 18:40:43 +05:30
Nabin Hait
a19c6a9278
fix: Fetch total stock at company in PO ( #25533 )
2021-04-30 18:38:49 +05:30
Nabin Hait
da0ba15cbf
fix: Fetch total stock at company in PO ( #25532 )
2021-04-30 18:38:41 +05:30
Deepesh Garg
204ea1027f
fix: Ignore validations for Tax Setup
2021-04-30 16:35:52 +05:30
Raffael Meyer
07a081d8ac
Merge branch 'develop' into datev_fixes
2021-04-30 12:25:40 +02:00
noahjacob
a90c81626f
fix: updated item filters for material request
2021-04-30 15:49:36 +05:30
Deepesh Garg
88d40e8dc4
fix: Remove extra space
2021-04-30 15:33:33 +05:30
Deepesh Garg
1deef5229e
fix: Linting and translation issues
2021-04-30 15:20:55 +05:30
Deepesh Garg
bd5ee7d725
fix: Use party account currency
2021-04-30 15:20:45 +05:30
Deepesh Garg
9cbca06f4e
fix: Updated filters for process statement of accounts
2021-04-30 15:20:31 +05:30
Deepesh Garg
303f6d2d36
Merge branch 'version-13-pre-release' of https://github.com/frappe/erpnext into psoa_fixes_v13_pre_release
2021-04-30 15:17:07 +05:30
Deepesh Garg
178938b2f0
fix: Ageing errors in PSOA
2021-04-30 15:14:24 +05:30
Deepesh Garg
c4231c72a6
Merge pull request #25524 from aerele/develop
...
fix: List invoices in Payment Reconciliation Payment
2021-04-30 14:15:33 +05:30
noahjacob
c0352010d3
test: creating schedule and visit
2021-04-30 14:09:30 +05:30
Anuja P
435e93bda9
fix: allocated amount change wrt paid amount change
2021-04-30 13:52:48 +05:30
Deepesh Garg
8aa57953ee
Merge pull request #25490 from deepeshgarg007/psoa_fixes_v2
...
fix: Ageing errors in PSOA
2021-04-30 13:07:00 +05:30
Deepesh Garg
cd9fa61659
Merge pull request #25521 from ernestoruiz89/patch-4
...
fix: Make strings translatable
2021-04-30 12:58:26 +05:30
Deepesh Garg
26920b439a
Merge pull request #25394 from meike289/feature/check-field-subscription-invoice
...
feat: new check field in subscriptions for (not) submitting invoices
2021-04-30 12:32:45 +05:30
noahjacob
7ad66caf7f
refactor: migrated calculation and validation logic in js to py
2021-04-30 11:43:38 +05:30
Deepesh Garg
0dc411951e
Merge pull request #25438 from nextchamp-saqib/round-off-diff-allowance
...
fix: ignore fraction difference while making round off gl entry
2021-04-30 11:11:21 +05:30
Vignesh S
7783a56c08
fix: List invoices in Payment Reconciliation Payment
...
Invoices are not listed in the Payment Reconciliation Payment table due to a typo in the code
2021-04-29 22:39:42 +05:30
Ernesto Ruiz
76e1e68cf4
fix: Make strings translatable
...
Make strings translatable
2021-04-29 08:24:56 -06:00
Saqib Ansari
3e83542360
fix: sider issues
2021-04-29 18:12:47 +05:30
Saqib
2bde1baa38
fix: remove print statement
2021-04-29 18:12:42 +05:30
Saqib Ansari
6dd1c5cf92
refactor: remove extra fields
2021-04-29 18:12:36 +05:30
Saqib Ansari
3a5ecb7587
fix: test
2021-04-29 18:12:32 +05:30
Saqib Ansari
973afeac3c
feat: set dynamic labels for payment schedule fields
2021-04-29 18:12:27 +05:30
Saqib Ansari
a91eebf6aa
feat: base payment amount in payment schedule
2021-04-29 18:12:23 +05:30
Saqib Ansari
e70d9c925c
fix: payment amount showing in foreign currency
2021-04-29 18:12:17 +05:30
Anuja Pawar
07fb98b91d
Merge branch 'develop' into fix_PE_allocated_amt
2021-04-29 17:17:21 +05:30
Anuja P
dd1e7624bf
fix: changing paid amount should change allocated amount
2021-04-29 17:00:59 +05:30
Deepesh Garg
7bf25b4cef
Merge pull request #25292 from nextchamp-saqib/payment-term-amount-display-currency-fix
...
fix: payment amount showing in foreign currency
2021-04-29 16:33:01 +05:30
Saqib Ansari
6fb417590f
fix: sider issues
2021-04-29 14:05:20 +05:30
noahjacob
90c667205a
test: added on_cancel test
2021-04-29 13:06:04 +05:30
noahjacob
93c22ebbb9
refactor: created separate function to update work_order on cancel
2021-04-29 12:57:41 +05:30
Deepesh Garg
3386d4948e
Merge pull request #25507 from AfshanKhan/fix-cancel-loan
...
fix: allow to cancel loan with cancelled repayment entry
2021-04-29 12:31:52 +05:30
Saqib
83e3820575
fix: remove print statement
2021-04-29 12:21:56 +05:30
Noah Jacob
dc086dd52f
fix: item stock levels displaying inconsistently ( #25506 )
...
* fix: fixed stock levels dashboard not displaying after any interactions
* fix: minor translation fix
2021-04-29 11:03:27 +05:30
Afshan
ab052599c0
fix: allow to cancel loan with cancelled replayment entry
2021-04-28 20:21:04 +05:30
noahjacob
56f697052c
test: added test case for combining items
2021-04-28 20:12:33 +05:30
noahjacob
b7ca913904
fix: Added Item Reference field to link tables and update work_order_qty
2021-04-28 19:27:20 +05:30
Raffael Meyer
d75b4c37a3
Merge branch 'develop' into feature/check-field-subscription-invoice
2021-04-28 12:38:49 +02:00
Raffael Meyer
a949480acf
fix: add translation to make semgrep pass
2021-04-28 12:38:23 +02:00
Saqib Ansari
44b07e4ef5
refactor: remove extra fields
2021-04-28 15:11:57 +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
Saqib Ansari
aa4f750d8c
fix: test
2021-04-28 14:42:49 +05:30
Saqib Ansari
3f53b87379
Merge branch 'develop' of https://github.com/frappe/erpnext into round-off-diff-allowance
2021-04-28 14:34:51 +05:30
noahjacob
82905166d9
fix: Fixed updating sales order work qty after cancelling work order
2021-04-28 10:14:36 +05:30
Nabin Hait
b7fea12cdf
Merge branch 'version-13' into develop
2021-04-27 20:08:01 +05:30
Nabin Hait
3e5c6424ed
bumped to version 13.1.1
2021-04-27 20:28:01 +05:50
Rucha Mahabal
a86a51f020
fix(HR): Permission error while adding weekly holidays ( #25450 )
2021-04-27 20:01:49 +05:30
