Saqib
0b040c7437
fix: cannot delete a project if linked with sales order ( #27536 )
2021-09-28 18:13:01 +05:30
Saqib
424efd41e5
feat(regional): toggle for reduced depreciation rate as per IT Act ( #27600 )
2021-09-28 18:12:02 +05:30
Subin Tom
0a28fed679
fix: patch fix, fields disabling
2021-09-28 13:54:01 +05:30
Alan
72c081fd8f
fix: apply price list after batch or serial no insertion ( #27566 )
2021-09-28 12:56:26 +05:30
Alan
b91333afdd
fix: set item.qty as mandatory in picklist ( #27680 )
2021-09-28 06:41:37 +00:00
GangaManoj
c84c983073
fix: Categorize into test suites
2021-09-28 01:22:38 +05:30
Noah Jacob
5c249decbb
fix(ux): added exception of template item in filters ( #27560 )
2021-09-27 22:34:27 +05:30
Ganga Manoj
28bdd6d2e3
Merge branch 'develop' into fix-depr-after-sale
2021-09-27 22:18:04 +05:30
GangaManoj
40ec2d622b
fix: Add tests for depreciation
2021-09-27 22:14:42 +05:30
GangaManoj
fdd9e6cc3c
fix: Replace asset.schedules with asset.get('schedules')
2021-09-27 22:14:16 +05:30
Deepesh Garg
cc5dd5c67d
feat: TDS deduction using journal entry and other fixes ( #27451 )
...
* fix: TDS deduction using journal entry
* fix: Multi category application against single supplier
* refactor: TDS payable monthly report
* fix: Server side handling for default tax withholding category
* fix: Supplier filter for Journal Entry
* refactor: TDS computation summary report
2021-09-27 21:43:20 +05:30
marination
596cf3951d
fix: Batch scans get overwritten on the same row
2021-09-27 15:06:46 +05:30
Saqib
b68ac24cd5
chore: add shipping address in eway bill test ( #27662 )
2021-09-27 15:03:58 +05:30
Saqib
f2fca59ba7
fix: cannot set custom label for 'total' field in print format ( #27664 )
2021-09-27 14:28:16 +05:30
Shariq Ansari
18918e1b4f
chore: linter fix
2021-09-27 14:08:44 +05:30
Saqib Ansari
a7df4227da
fix: trim sales invoice custom field lengths
2021-09-27 13:56:16 +05:30
Shariq Ansari
0de735f20b
fix: Fixed alignment of Title, Subtitle, Action Button
2021-09-27 13:50:19 +05:30
Subin Tom
54754f4eb8
fix: updated patch, add fields only if fields are checked
2021-09-27 12:51:54 +05:30
Saqib
711395db22
fix: linting errors
2021-09-27 12:26:18 +05:30
Saqib
1f8ad72418
fix: indentation
2021-09-27 12:21:06 +05:30
Saqib
30f59b09fd
chore: log modified invoices
2021-09-27 12:20:16 +05:30
ChillarAnand
765a9bb731
refactor: Remove sales invoice custom js related to healthcare
2021-09-27 07:34:54 +05:30
Saqib Ansari
18e5d59d24
fix: unknown column 'ref_exchange_rate'
2021-09-26 20:26:45 +05:30
Dany Robert
5ce6a4c107
fix: tax rate being overridden in case of 0.00
...
Tax rate could be different for different expenses.
Therefore, rate is kept as 0.00 and tax amount entered manually.
But fetching used to override the rate(upon saving) and mess up the amount.
2021-09-26 18:31:27 +05:30
Saqib
e8ff649298
Merge branch 'develop' into fix-32644
2021-09-26 17:07:46 +05:30
Saqib Ansari
e6b4d33f4b
chore: hide exchange gain loss if empty
2021-09-26 17:07:13 +05:30
Saqib Ansari
beebfb323a
patch: invalid gain loss gl entry
2021-09-26 16:58:55 +05:30
Saqib
f8c1c73953
fix: local variable 'fiscal_year_details' referenced before assignment ( #27656 )
2021-09-26 16:27:56 +05:30
Saqib Ansari
78ad50efc2
fix: cost center in exchange gain loss gl entry
2021-09-26 16:08:15 +05:30
Saqib Ansari
dd2d039ca8
chore: hide exchange gain loss if empty
2021-09-26 15:51:03 +05:30
Saqib Ansari
64efe8bf15
fix: setting of gain/loss if party account is in company currency
2021-09-26 15:46:13 +05:30
escix
dafe99b6e2
fix: holiday message reminder
...
Minor grammatical change
2021-09-26 11:09:13 +05:30
GangaManoj
796ed947ce
fix: Reverse depreciation entry made on sale if asset that was set to be sold in the future gets returned
2021-09-25 19:11:29 +05:30
GangaManoj
b9fb59da58
fix: Reset depreciation schedule on returning asset
2021-09-25 19:04:16 +05:30
Sagar Vora
c8b9a55e96
feat: add Partly Paid
status in Invoices ( #27625 )
2021-09-22 12:11:35 +05:30
Frappe PR Bot
2af6ea68ae
fix: remove unknown field employee_name from query (bp #27634 )
...
* fix: remove unknown field employee_name from query
* fix: remove unknown fieldname
Co-authored-by: root <root@vultr.guest>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit 9ebabb86b3d28e2c94eb2761f1864c88b6eb1e59)
Co-authored-by: Bhavesh Maheshwari <34086262+bhavesh95863@users.noreply.github.com>
2021-09-21 20:33:09 +05:30
Ankush Menat
c302c7ab42
fix: remove bad default for anniversary reminders ( #27632 )
...
🤦
2021-09-21 17:51:46 +05:30
Marica
9110223341
fix: (ux) Use subassembly schedule date while making WO from Prod Plan ( #27628 )
...
- Set subassemply WO's planned start date from Production Plan
2021-09-21 16:50:14 +05:30
Kenneth Sequeira
abded895f3
fix: update default KSA VAT rate for setup ( #27614 )
2021-09-21 10:58:18 +05:30
François de Ryckel
5c400da4e2
Update training_result.js ( #27615 )
...
cur_frm is deprecated
2021-09-21 09:29:15 +05:30
GangaManoj
7ab3b9dd5a
fix: Add test for depreciation on sale of a depreciated Asset
2021-09-21 07:11:40 +05:30
GangaManoj
249672c35d
fix: Add depreciation_schedule details in create_asset()
2021-09-21 07:11:40 +05:30
GangaManoj
700e78d69b
fix: Remove extra brackets
2021-09-21 07:11:40 +05:30
Ganga Manoj
eb8122baba
Merge branch 'develop' into fix-depr-after-sale
2021-09-21 06:29:41 +05:30
GangaManoj
3c8879e777
fix: Calculate depreciation_amount accurately
2021-09-21 06:07:06 +05:30
GangaManoj
244d9dee04
fix: Correct expected_values
2021-09-21 06:06:21 +05:30
Abdullah A. Zaqout
6d8e869a92
fix(pos): check if item exists before fetching available qty ( #27581 )
2021-09-20 21:35:37 +05:30
Anuja Pawar
190c2d84da
fix: reference row added in allocation table ( #27602 )
2021-09-20 21:32:38 +05:30
Shariq Ansari
3e8e6ac4e2
fix: Creating unique hash for slider id instead of slider name
2021-09-20 20:52:08 +05:30
Ankush Menat
4f01115f2f
Merge pull request #27601 from ankush/overbill_warn
...
fix(ux): warn when overbilling allowance was bypassed due to role
2021-09-20 17:42:29 +05:30
Ankush Menat
21a955d20b
fix(ux): better error message
...
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-09-20 17:14:35 +05:30
Ankush Menat
5e4fbba753
refactor: add guard clause in for loop
...
Reduce overly indented code/improve readability.
2021-09-20 16:40:51 +05:30
Ankush Menat
43bf82b58b
fix: warn when overbilling checks are skipped.
2021-09-20 16:31:20 +05:30
Subin Tom
0ff7367f39
fix: Tax Breakup table headers fix ( #27596 )
2021-09-20 16:13:36 +05:30
Saqib
ef66beec51
fix(plaid): query to check if bank account exists
2021-09-20 15:33:29 +05:30
ChillarAnand
aa580769a6
chore: Code clean up
2021-09-20 15:27:43 +05:30
Ankush Menat
648b2d72a5
perf: extract loop invariant db calls
2021-09-20 15:27:12 +05:30
Deepesh Garg
f07ff92a35
fix: Improvements in COA Importer ( #27584 )
2021-09-20 11:12:39 +05:30
GangaManoj
164a2ad28d
fix: Calculate depreciation_left accurately
2021-09-20 04:33:30 +05:30
Frappe PR Bot
4f7af79c31
fix: PO/PINV - Check if doctype has company_address field before setting the value ( #27441 ) ( #27576 )
...
Co-authored-by: Vama Mehta <vama.mehta@inqubit.in>
(cherry picked from commit 666eaae6ce976c5d820b3b9f91d23a0ed28a263a)
Co-authored-by: vama <vamagithub@gmail.com>
2021-09-18 13:34:27 +05:30
rohitwaghchaure
bf2a590332
fix: View Stock / Accounting Ledger button not showing in the stock entry ( #27570 )
2021-09-17 18:39:21 +05:30
Saqib
e03d9aa889
fix: unecessary keyword args were passed in mapper functions ( #27563 )
2021-09-17 13:03:27 +05:30
Subin Tom
d49346ac45
fix: Tax breakup based on items, missing GST fields ( #27524 )
...
* fix: Tax breakup based on items
* fix: added gst fields,warehouse validation to pos inv,patch
* fix: tax breakup test fix, eway bill hsn fix
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-09-17 10:39:03 +05:30
Marica
41f11eca72
fix: Remove duplicates from customer_code field ( #27555 )
2021-09-17 10:27:29 +05:30
Ahmad
0ab57d49c1
fix: pre-commit hooks
2021-09-17 01:54:59 +05:00
Ahmad
9dae36b81d
fix: pre-commit hooks
2021-09-17 01:51:32 +05:00
Ahmad
4ec733fcc0
fix: pre-commit hooks
2021-09-17 01:46:45 +05:00
Ahmad
f1e5a64c61
refactor (regional): KSA utils
2021-09-17 01:33:32 +05:00
Ahmad
05321d7f4e
Update erpnext/regional/saudi_arabia/utils.py
...
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-09-17 01:28:52 +05:00
Ahmad
95b3b9c8f5
Update erpnext/regional/saudi_arabia/utils.py
...
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-09-17 01:27:37 +05:00
Ahmad
940db71a82
fix: indentations
2021-09-17 01:14:41 +05:00
Subin Tom
5c18654113
fix: Renamed child table doctype, delete taxes for non nexus state
2021-09-17 00:10:41 +05:30
Deepesh Garg
c9c8957250
feat: Merge POS invoices based on customer group ( #27471 )
...
* feat: Merge POS invoices based on customer group
* fix: Linting Issues
* fix: fieldname
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-09-16 19:33:57 +05:30
Saqib
5eba1ccd51
fix: no validation on item defaults ( #27393 )
...
* fix: no validation on item defaults
* fix: cache value while validating
* test: item default company relation
* fix: reorder validations
* refactor: add guard conditions on update_defaults
* test: add default warehouse for item group
* fix: validate item defaults for item groups
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-09-16 17:31:37 +05:30
Marica
9b388883d3
fix: Validate if item exists on uploading items in stock reco ( #27538 )
...
* fix: Validate if item exists on uploading items in stock reco
- Uploading non existent item in stock reco and then changing warehouse or batch gave an error
- Check for non existent item
* chore: translation
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2021-09-16 15:47:17 +05:30
Ankush Menat
78fe92542c
fix(ProdPlan): Get SubAssy Items does not work ( #27537 )
...
* fix(ProdPlan): Get SubAssy Items does not work
This button wasn't working unless the document was saved already.
* fix: make form dirty when subassy item are fetched
2021-09-16 15:34:50 +05:30
Subin Tom
11bd42467e
Update erpnext/erpnext_integrations/taxjar_integration.py
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-09-16 14:42:15 +05:30
Subin Tom
435a5e4fa3
Update erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.js
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-09-16 14:42:06 +05:30
Subin Tom
486d7c3a39
Update erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.py
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-09-16 14:41:48 +05:30
Subin Tom
0e527311b9
Update erpnext/erpnext_integrations/taxjar_integration.py
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-09-16 14:41:38 +05:30
Rucha Mahabal
866763c16a
fix(minor): Employee filter in Unpaid Expense Claims report ( #27530 )
2021-09-16 00:05:16 +05:30
rohitwaghchaure
e6a1ad8016
fix: not able to submit stock entry with 350 items ( #27523 )
2021-09-15 20:42:47 +05:30
Ankush Menat
70c203d19e
test: automated test for running all stock reports ( #27510 )
...
* test: automated test for running all stock reports
These test do not assert correctness, they just check that "execute" function
is working with sane filters.
* test: make report execution test modular
2021-09-15 19:24:35 +05:30
Frappe PR Bot
29dab0699c
fix(minor): Remove b2c limit check from CDNR Invoices ( #27516 ) ( #27520 )
...
* fix(minor): Remove b2c limit check from CDNR Invoices
* fix: Remove unnecessary format
(cherry picked from commit 978028c880445362afc0cfca9118424174541cc7)
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-09-15 19:12:02 +05:30
Noah Jacob
5e0b21582a
fix: table data deleted on submitted maintenance schedule ( #27513 )
2021-09-15 17:37:52 +05:30
Frappe PR Bot
d4d5e2786f
fix: Maintain same rate in Stock Ledger until stock become positive ( #27227 ) ( #27478 )
...
* fix: Maintain same rate in Stock Ledger until stock become positive
* fix: Maintain same rate in Stock Ledger until stock become positive
(cherry picked from commit 10754831c33b3459d5a45c98f875afa48a444627)
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-09-15 17:07:58 +05:30
rohitwaghchaure
c5a77f60ed
feat: provision to add scrap item in job card ( #27483 )
2021-09-15 16:45:57 +05:30
Frappe PR Bot
6e7945fbb7
fix: Tags getting fetched correctly in Get Supplier in RFQ (Request For Quotation) ( #27499 ) ( #27506 )
...
* fix: Tags getting fetched correctly in Get Supplier in RFQ( Request For Quotation ) #26343
* fix: Linting issues
* fix: remove unnecessary caching
[skip ci]
Co-authored-by: Vama Mehta <vama.mehta@inqubit.in>
Co-authored-by: Ankush Menat <ankush@iwebnotes.in>
(cherry picked from commit 50fe23308acad58ab2db2056ea6dd163913725ef)
2021-09-15 11:10:11 +05:30
Deepesh Garg
759f2b7920
fix: Autoname for customer and supplier ( #27398 )
2021-09-15 10:24:26 +05:30
Deepesh Garg
625626b973
fix: Values with same account and different account number in consolidated balance sheet report ( #27493 )
2021-09-15 10:10:54 +05:30
rohitwaghchaure
2e2985e4f1
fix: calculate operating cost based on BOM Quantity ( #27464 )
...
* fix: calculate operating cost based on BOM Quantity
* fix: added test cases
2021-09-15 00:37:41 +05:30
Subin Tom
3bb60a439a
fix: sales_tax attribute in api call before submit
2021-09-14 22:04:57 +05:30
Subin Tom
b01fe1c3e2
fix: TaxJar update - nexus, selective api call
2021-09-14 20:42:47 +05:30
Deepesh Garg
c53b78e712
fix: Patch for updating tax withholding category dates ( #27489 )
2021-09-14 20:28:48 +05:30
Ankush Menat
fea51f4082
chore: isort
...
[skip ci]
2021-09-14 19:04:47 +05:30
Marica
de9f78350b
Merge branch 'develop' into job-card-excess-transfer
2021-09-14 16:50:06 +05:30
marination
469bb8d977
test: Work Order Material Transfer against Job Card
...
- Tests for multiple items transfer and excess transfer against JC
- Remove unused __future__ imports
- Changed Copyright year
- Sider: (js) Added space before if
2021-09-14 16:27:39 +05:30
Ahmad
8a42570c96
refactor(regional): moved methos to region specific utils for KSA
2021-09-14 14:45:23 +05:00
Ahmad
de01066ef5
Update erpnext/regional/saudi_arabia/setup.py
...
Method name updated
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-09-14 14:29:45 +05:00
Ahmad
0950713e4c
Update erpnext/regional/saudi_arabia/setup.py
...
Method name updated
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-09-14 14:29:33 +05:00
Ahmad
6985ca210e
Refactor erpnext/regional/__init__.py
...
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-09-14 14:28:57 +05:00
Ahmad
b5b61b3a3d
Update erpnext/regional/report/ksa_vat/ksa_vat.py
...
String made translatable
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-09-14 14:26:44 +05:00
DeeMysterio
aa82624f31
Merge pull request #27281 from DeeMysterio/party-specific-items
...
feat: link items to supplier / customer
2021-09-14 13:58:18 +05:30
Shariq Ansari
9aa6f52edd
fix: Webform Permission for custom doctype ( #26232 )
...
* fix: Webform Permission for custom doctype
* fix: sider fix
* fix: app check condition for getting correct list_context
* chore: Better naming convention
* test: Added test case to check permission for webform of custom doctype
* chore: linting issue
* chore: linting issue
* fix: sider fix
* test: minor changes
* chore: linter and better naming method
* chore: linter fix
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-09-14 12:49:08 +05:30
marination
9520215e2b
feat: Handle Excess/Multiple Item Transfer against Job Card
...
- Hide MR/Material Transfer buttons in JC if cancelled
- Show MR/Material transfer buttons if pending to transfer or excess transfer allowed
- Renamed ‘Transferred Qty’ to ‘FG Qty from Transferred Raw Materials’ in JC
- Set status to Completed in JC in case of excess transfer too
- During excess transfer against JC, avoid negative ‘For Quantity’. Set to 0 instead
- Job card section and excess transfer allowance checkbox in Manufacturing Settings
- Renamed ’Allow Multiple Material Consumption’ to ‘Allow Continuous Material Consumption’ (fiedname is same)
- Secured denominator variables in `get_transfered_raw_materials` to avoid ZeroDivisionError
2021-09-14 12:33:21 +05:30
Chillar Anand
95460d9818
fix(HR): Ignore invalid fields when updating employee details ( #27456 )
2021-09-14 12:00:34 +05:30
Faris Ansari
1c1b476d67
perf: Optimize get_attribute_filters ( #26729 )
...
* perf: Optimize get_attribute_filters
* fix: handle when filter attributes are undefined
* chore: unused imports
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-09-14 11:41:19 +05:30
Rucha Mahabal
b98740b44a
fix: employee advance return through multiple additional salaries ( #27438 )
...
* fix: employee advance return through multiple additional salaries
* test: test repay unclaimed amount from salary
* fix: sorting in imports
2021-09-14 11:20:15 +05:30
Deepesh Garg
c7ceb37b63
Merge pull request #27465 from nextchamp-saqib/so-analytics-report-fix
...
fix: cancelled sales invoices are considered in billed qty calculation
2021-09-14 10:05:36 +05:30
Saqib Ansari
44139fbac5
fix: cancelled sales invoices are considered in billed quantity calculation
2021-09-13 16:50:11 +05:30
Saqib
a5baf909b7
fix: editable price list rate field in sales transactions ( #27455 )
2021-09-13 15:50:20 +05:30
Rucha Mahabal
bab644a249
fix(Payroll): incorrect component amount calculation if dependent on another payment days based component ( #27349 )
...
* fix(Payroll): incorrect component amount calculation if dependent on another payment days based component
* fix: set component amount precision at the end
* fix: consider default amount during taxt calculations
* test: component amount dependent on another payment days based component
* fix: test
2021-09-13 13:24:27 +05:30
Saqib
7292f5476d
feat: (get_items_from) filter material request item in purchase order ( #27449 )
2021-09-13 12:13:43 +05:30
Ankush Menat
d743c41b54
fix(ux): apply proper filtering in stock reports ( #27411 )
...
* fix(ux): apply proper filtering in stock reports
Stock Balance: apply company filter to warehouse field
Stock Ageing: apply company filter to warehouse field
* fix: unnecessary parens
Co-authored-by: Alan <2.alan.tom@gmail.com>
2021-09-12 16:38:18 +05:30
Ankush Menat
6ef879fca2
fix(ux): clean invalid fields from variant setting ( #27412 )
2021-09-12 16:36:51 +05:30
Frappe PR Bot
a52d4c25ff
fix: fail migration due to None type during v13_0.update_returned_qty_in_pr_dn ( #27430 ) ( #27436 )
...
* fix: fail migration due to None type
* fix: incorrect key: value pair in filter.
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit becf471a3a238cfaa20a8940e0106c7e0e0386c2)
Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
2021-09-11 17:54:55 +05:30
Sagar Vora
dae0a1c1d6
fix: Template Error due to use of single quote ( #27433 )
2021-09-11 17:54:21 +05:30
Ankush Menat
62fc544280
test: basic tests for controllers/queries ( #27422 )
2021-09-10 12:46:35 +05:30
Anuja Pawar
a58e309297
fix: fix to fetch customers and billing email in PSOA ( #27363 )
2021-09-09 19:37:52 +05:30
Subin Tom
8b4c57ee09
fix: pos payment mode selection issue ( #27409 )
2021-09-09 19:33:34 +05:30
Anupam Kumar
7edac5a5d7
fix: removing duplicate currency() from sales_invoice.js ( #27410 )
2021-09-09 19:17:01 +05:30
Noah Jacob
acdb10377f
refactor: .doc missing and empty row on new doc ( #27408 )
...
* refactor: .doc missing and empty row on new doc
* fix: let -> const
2021-09-09 18:54:00 +05:30
Ankush Menat
678335f8ac
fix: job card overlap unknown column jc.employee
( #27403 )
...
* fix: incorrect query for job card overlap
* test: employee overlap in job cards
* test: simplify/refactor job card tests
2021-09-09 12:24:23 +05:30
Deepesh Garg
9104796eb8
Merge pull request #27258 from deepeshgarg007/tds_validity
...
feat: Validity dates in Tax Withholding Rates
2021-09-09 12:17:36 +05:30
Anuja Pawar
3576668638
fix: added Show Remarks checkbox in AR & AP reports ( #27374 )
2021-09-09 11:57:29 +05:30
Deepesh Garg
e7e2ce1271
fix: Linting Issues
2021-09-09 11:36:57 +05:30
Deepesh Garg
c33bbd4f39
fix: Test Case
2021-09-09 11:13:29 +05:30
rohitwaghchaure
295020451f
fix: added delivery date filters to get sales orders in production plan ( #27367 )
2021-09-08 19:28:30 +05:30
Alan
81d3524d27
fix: auto complete sales order rows in production plan ( #27352 )
...
* fix: auto complete sales order rows in production plan
* fix: sider
2021-09-08 16:48:42 +05:30
Saqib
9c27f9be1e
fix: document naming rule not working for subscription invoices ( #27386 )
2021-09-08 16:47:04 +05:30
Dany Robert
fa819f2fb0
fix: General Ledger translation issues ( #27298 )
...
* fix: remove translations from GL report options
Options need not be translated, their display label gets translated
client side.
* fix: make group by options translatable
* ci: semgrep rule for translated options in report
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-09-08 16:28:05 +05:30
Saqib
df3e4ce1c0
fix: scan barcode fields input length ( #27389 )
...
* fix: undo unintentional changes
* fix: scan barcode fields input length
2021-09-08 16:04:13 +05:30
Deepesh Garg
ee1486209d
Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity
2021-09-08 11:33:42 +05:30
Marica
61a1356109
fix: Check if Item is serialised before trying to fetch SN and set SO in it ( #27358 )
2021-09-07 14:42:17 +05:30
rohitwaghchaure
058d98342a
fix: missed to add voucher_type, voucher_no to get GL Entries ( #27368 )
...
* fix: missed to add voucher_type, voucher_no to get gl entries
* test: get voucherwise details utilities
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-09-07 12:14:40 +05:30
Deepesh Garg
8f6d22b7ea
Merge pull request #27373 from deepeshgarg007/gstin_filter_issue
...
fix: GSTR-1 Reports not showing any data
2021-09-07 11:09:14 +05:30
Deepesh Garg
6dfcc1e2ae
fix: Remove print and debug
2021-09-07 11:08:30 +05:30
Deepesh Garg
e1f55df4d7
fix: GSTR-1 Reports not showing any data
2021-09-07 11:07:22 +05:30
Mohammed Yusuf Shaikh
d795e55694
feat(CRM): Sales Pipeline Analytics Report and Opportunity Summary by Sales Stage Report ( #26639 )
...
* feat: Sales Pipeline Analytics Report
* fix: sider Issues and added tests
* fix: Semgrep Issue
* feat: Opportunity Summary by Sales Stage Report
* fix: add some checks and tests
* fix: sider issues and test
* fix: additional checks for error handling and minor changes
* fix: remove unused conditions
* fix: Changes mentioned on PR
* fix: currency conversions and other changes
* fix: remove unused imports
* fix: correction for failing test case
* fix: recorrected failing test case
* fix: sider issues and resolve test case errors
* fix: rewrite query using query builder
* fix: test case changes
* fix: sider fixes and other changes
* fix: clear data before running test
* fix: test case fixed
* refactor: code formatting
- smaller functions
- variable and function naming
* refactor: improve code formatting
* fix: linter issues
* fix: linter issues
* fix: change indentation to tabs
* fix: linter issues
* fix: naming, code formatting
* fix: quarterly values not showing up in Sales Pipeline Analytics
* fix: typo in tests
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-09-07 10:49:34 +05:30
Ahmad
69470fc15a
Merge branch 'develop' into ksa-vat
2021-09-07 00:02:12 +05:00
Anupam Kumar
88c9fe35bd
fix: employee remider settings ( #27365 )
2021-09-07 00:15:58 +05:30
Ahmad
87380d021d
feat(regional): QR Code generation for Saudi Arabia Sales Invoices
2021-09-06 23:36:55 +05:00
Ahmad
b42d63e526
Merge remote-tracking branch 'refs/remotes/havenir/ksa-vat' into ksa-vat
2021-09-06 23:26:52 +05:00
Ahmad
cb0c2d1477
feat(Regional): KSA VAT Report
2021-09-06 23:25:20 +05:00
ChillarAnand
c8565c7090
chore: Removed healthcare module code in other modules
2021-09-06 20:47:27 +05:30
Anupam Kumar
b0d970001a
feat: multi-currency in Opportunity ( #26590 )
...
* feat: multi-currency
* refactor: lead form
* fix: test case for opportunity item
* fix: removing local changes
* fix: test cases
* fix: test cases
* fix: review changes
* fix: reverting lead.json chnages
* fix: toggle display for currency fields
* review changes
* fix: test case
* fix: linter issues
* fix: unused import
* feat: grand total in opportunity
* fix: patch
* fix: sort imports
* fix: reload opportunity item doctype
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-09-06 16:54:28 +05:30
Florian HENRY
aa7ee3ca03
fix: link in dashboard missing on SI from DN
2021-09-06 11:40:44 +02:00
Ankush Menat
14b01619de
fix: patch failure for vat audit report ( #27355 )
2021-09-06 13:47:56 +05:30
Marica
0f2a52078c
fix: Dont fetch Stopped/Cancelled MRs in Stock Entry Get Items dialog ( #27326 )
2021-09-06 13:14:09 +05:30
Deepesh Garg
51d9572fe7
fix: Hardcode fiscal year and posting date
2021-09-05 17:56:12 +05:30
Deepesh Garg
ceaa804f04
fix: Presentation currency conversion in reports ( #27316 )
2021-09-05 17:21:29 +05:30
rohitwaghchaure
7b4a65484a
fix: manually added weight per unit reset to zero after save ( #27330 )
2021-09-03 22:00:14 +05:30
Ankush Menat
73b3a2f685
chore: whitespace
2021-09-03 21:57:38 +05:30
Deepesh Garg
092d41ecda
fix: Debug CI
2021-09-03 20:04:18 +05:30
Deepesh Garg
41392acd18
Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity
2021-09-03 19:19:35 +05:30
Deepesh Garg
8f5a77446e
Merge pull request #27279 from deepeshgarg007/gstr_1_cdnr_unregistered_json_develop
...
feat: CDNR Unreg json generation
2021-09-03 13:55:00 +05:30
Deepesh Garg
a06a70d1a4
fix: Patch error and tests
2021-09-03 13:13:37 +05:30
Deepesh Garg
79d250845e
fix: Patch
2021-09-03 13:13:37 +05:30
Deepesh Garg
2b34028acd
fix: Patch and linting errors
2021-09-03 13:13:37 +05:30
Ganga Manoj
64fcd1a092
fix: make datetime objects readable ( #27301 )
...
* fix: Make datetime objects readable
* fix: Remove unused imports
2021-09-03 12:54:47 +05:30
Subin Tom
798b464ee3
fix: braintree payment processed twice ( #27300 )
2021-09-03 12:30:57 +05:30
Saqib
98696c0ec9
Merge pull request #27306 from GangaManoj/fix-selling-settings
...
fix: Move related fields together in Selling Settings
2021-09-03 12:30:02 +05:30
Ankush Menat
d1fe060e4a
fix: south africa vat patch failure ( #27323 )
...
reload doc is necessary on new doctypes
2021-09-03 12:02:32 +05:30
Shariq Ansari
e68c55ce83
fix: Removing first Spacer from home page ( #27321 )
2021-09-03 11:00:33 +05:30
ChillarAnand
66e92d423e
chore: Added healthcare deprecation warning patch
2021-09-02 20:02:11 +05:30
ChillarAnand
e913e277d9
chore: Rename imports from erpnext to healthcare
2021-09-02 19:47:39 +05:30
GangaManoj
ebdc568e85
fix: Rename 'Action if Same Rate is Not Maintained' to 'Action if Same Rate is Not Maintained Throughout Sales Cycle'
2021-09-02 19:32:51 +05:30
Deepesh Garg
e1fffdb262
fix: Linting issues
2021-09-02 19:10:49 +05:30
Deepesh Garg
c85242e03d
Merge branch 'develop' of https://github.com/frappe/erpnext into gstr_1_cdnr_unregistered_json_develop
2021-09-02 18:59:59 +05:30
Deepesh Garg
e8a5dc371b
fix: Add payment entry custom fields
2021-09-02 18:56:04 +05:30
ChillarAnand
5d4133ecac
chore: Removed healthcare demo, patch files
2021-09-02 18:25:36 +05:30
ChillarAnand
bcb3f0fedb
chore: Removed healthcare module
2021-09-02 18:14:34 +05:30
Ankush Menat
eec40513be
fix: minor linting issues ( #27314 )
...
* fix: syntax error in gratuity
* fix: unpacking None into three variables
* fix: unexpected kwarg for delete_accounting_dimensions
2021-09-02 17:42:45 +05:30
Ankush Menat
60185c8c71
chore: linting
...
[skip ci]
2021-09-02 17:36:05 +05:30
Chillar Anand
915b34391c
chore: Clean up imports ( #27302 )
...
* chore: Added isort to pre-commit config
* chore: Sort imports with isort
* chore: Clean up imports with pycln
* chore: Sort imports with isort
* chore: Fix import issues
* chore: Clean up sider issues
* chore: Remove import errors from flake8 ignore list
* chore: Clean up lint issues
2021-09-02 16:44:59 +05:30
Ankush Menat
b25d28e023
fix(patch): delete stale shopify doctypes ( #27313 )
2021-09-02 14:53:06 +05:30
Saqib
366012817f
Merge branch 'develop' into fix-selling-settings
2021-09-02 11:13:52 +05:30
Saqib
a158b825fc
Merge pull request #27124 from GangaManoj/gross-profit-product-bundle
...
feat: Improve Product Bundle handling
2021-09-02 11:12:56 +05:30
Devin Slauenwhite
43c476ddf7
fix: (Backport-develop) track salary slip ytd gross salary. ( #27242 )
...
* fix: track salary slip ytd gross salary.
* fix: ytd gross salary unique label
* Revert "fix: ytd gross salary unique label"
This reverts commit a68b387ac21e32c250d042caf75ef301b5a49a1a.
* fix: gross ytd salary unique label
2021-09-02 09:39:35 +05:30
Anupam Kumar
c25367f107
Merge pull request #27292 from anupamvs/comany-name-field-issue-develop
...
fix: mapping for company name lead->contact
2021-09-02 09:32:47 +05:30
Rucha Mahabal
f828d853e3
fix: Org Chart fixes ( #27290 )
...
* fix(org chart): multiple root nodes not expanding on clicking Expand All
* fix: unstable filter inserts duplicate nodes
2021-09-01 23:07:26 +05:30
GangaManoj
799d67d785
fix: Only display 'Role Allowed to Override Stop Action' if 'Maintain Same Rate Throughout Sales Cycle' is checked
2021-09-01 22:55:10 +05:30
GangaManoj
f2a7fbd126
fix: Remove redundant description
2021-09-01 22:49:05 +05:30
GangaManoj
06484321d1
fix: Move related fields to the same section
2021-09-01 22:48:09 +05:30
Deepesh Garg
d5a736d11e
test: Update test case
2021-09-01 21:15:24 +05:30
Ankush Menat
dea5c34d8d
chore: whitespace
2021-09-01 19:59:22 +05:30
Ankush Menat
81eb6fde07
Merge pull request #27288 from ankush/strict_linting
...
chore: cleanup linting errors and introduce strict linting checks
2021-09-01 19:32:49 +05:30
Raffael Meyer
605f73b4d4
feat: add voucher-specific data to DATEV export (bp #26589 ) ( #27287 )
...
* feat: add voucher-specific data to datev export
* refactor: def instead of lambda
2021-09-01 19:27:54 +05:30
rohitwaghchaure
2a8cd05b44
fix: production plan UX and validation message ( #27278 )
2021-09-01 19:16:03 +05:30
Marica
9506c14d35
fix: Zero division error while fetching unconsumed materials ( #27293 )
...
`
2021-09-01 18:49:12 +05:30
Jannat Patel
696fa6c8fe
Merge branch 'develop' into comany-name-field-issue-develop
2021-09-01 18:25:46 +05:30
Anupam
821f6a6178
fix: mapping for company name lead->contact
2021-09-01 17:49:05 +05:30
Ankush Menat
b147b85e6a
chore: whitespace / eof fixes
2021-09-01 16:57:21 +05:30
Ankush Menat
e46567192a
fix: invalid escape sequences in regex
2021-09-01 16:57:17 +05:30
GangaManoj
bc79084dac
fix: Add Product Bundle field in Items table
2021-09-01 16:06:47 +05:30
GangaManoj
bbb9fa4bf8
fix: Remove Rate from field_no_map
2021-09-01 16:00:59 +05:30
GangaManoj
471fd9718c
fix: Set Product Bundle's Delivery Dates in SO as Bundle Items' Delivery Dates in PO
2021-09-01 15:36:07 +05:30
Ankush Menat
55b24345a0
fix: remove unused format from query
...
doctype is not used in query and parent alone is enough to identify
packed items.
2021-09-01 15:33:37 +05:30
Ankush Menat
7d9819f352
fix: remove duplicate imports
2021-09-01 15:33:35 +05:30
GangaManoj
4d8f833cc9
fix: Remove Add Row and Delete Row options for Packed Items table
2021-09-01 15:20:40 +05:30