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

23330 Commits

Author SHA1 Message Date
rohitwaghchaure
c7b63bfcaf
Merge pull request #22415 from Anurag810/payroll_entry_ux_fix_2.0 
fix: Create salary slip button disappears
 2020-07-08 12:35:24 +05:30
rohitwaghchaure
e862b3f9ce
Update payroll_entry.js 2020-07-08 12:34:15 +05:30
rohitwaghchaure
3431d42d12
Merge pull request #22610 from frappe/lead-creation-from-email 
fix: Creating Lead from email
 2020-07-08 12:27:18 +05:30
rohitwaghchaure
50f48f5176
Merge pull request #22592 from frappe/number-card-filter-fix 
fix: crm dashboard Number card filter fix
 2020-07-08 12:25:12 +05:30
rohitwaghchaure
fae570e0a2
Merge pull request #22612 from netchampfaris/fix-item-price-labels 
fix: Remove trailing spaces from labels
 2020-07-08 12:14:21 +05:30
Faris Ansari
0a06580e2c
fix: Update message 
Co-authored-by: gavin <gavin18d@gmail.com>
 2020-07-08 12:06:28 +05:30
Deepesh Garg
9071a7de82 fix: Add default cost center in payment reconciliation JV 2020-07-08 11:27:25 +05:30
Kaviya Periyasamy
923ed8a741 fix: log type mandatory error while exposing api call to employee checkin 2020-07-08 11:15:04 +05:30
Faris Ansari
f3a6e30e6a fix: Check if homepage is not setup-wizard 
The new desk changes sets the default homepage to 'workspace'. To avoid
problem in the future, check if the value is not setup-wizard.
Also throw an exception if the check passes, so it exits with error.
 2020-07-08 10:45:55 +05:30
Deepesh Garg
addd1e842b
Merge pull request #22568 from ahmadpak/develop 
fix: Item Tax Template permissions as per company
 2020-07-08 10:08:53 +05:30
Faris Ansari
8c5c74ca06 fix: Remove trailing spaces from labels 2020-07-08 09:20:13 +05:30
Anupam K
6669f7457a hr dashboard number card filter fix 2020-07-08 01:24:53 +05:30
Anupam K
8bc92b90f5 updating lead.py 2020-07-08 00:56:21 +05:30
Rucha Mahabal
3d14011d23 fix: allow creating SLA documents even if SLA tracking is not enabled 2020-07-07 18:30:54 +05:30
Afshan
e3269039d3 feat: added columns to get complete analysis for material request 2020-07-07 18:01:37 +05:30
Marica
4d5d706a4b
Merge branch 'develop' into error-message 2020-07-07 16:41:39 +05:30
Mitali Deshpande
f642be9727 fix: Changed error message in the Product Bundle 2020-07-07 16:14:01 +05:30
Marica
f4d0a3e7b0
Merge branch 'develop' into whitelist-query 2020-07-07 15:42:42 +05:30
rohitwaghchaure
546cfdaac2
Merge pull request #22601 from deepeshgarg007/payment_reco_company 
fix: Payment reco error in multi-company setup
 2020-07-07 15:32:36 +05:30
Deepesh Garg
ca351e3549 fix: Pass company 2020-07-07 14:37:17 +05:30
Marica
8dbdf0902f
Merge branch 'develop' into whitelist-query 2020-07-07 14:29:24 +05:30
marination
32f3d24dac fix: Employee benefit application & quality inspection whitelist 2020-07-07 14:31:49 +05:30
Deepesh Garg
e2fdff5777 fix: Payment reco error in multicompany setup 2020-07-07 14:14:07 +05:30
Marica
7860d9e699
Merge branch 'develop' into whitelist-query 2020-07-07 11:53:19 +05:30
Afshan
70b3edd502 fix: format according to cordacy 2020-07-07 00:03:45 +05:30
Afshan
3819c0bf28 fix: cost center should only show option of selectedcompany 2020-07-06 23:52:11 +05:30
Marica
d187a6ac48
Merge branch 'develop' into exploded-item-rate 2020-07-06 23:35:37 +05:30
marination
4355d3cf0f fix: Exploded Item Rate 2020-07-06 23:15:08 +05:30
Marica
5f299a08bd
fix: General Message in previous doc validation for buying and selling (#22546) 2020-07-06 18:26:56 +05:30
Marica
e3e5fd7e74
fix: Skip Progress and Completed by fields on Task Duplication (#22565) 2020-07-06 18:26:19 +05:30
rohitwaghchaure
39933a4db1
Merge pull request #22441 from nextchamp-saqib/asset-delete-fix 
fix: cannot cancel asset and asset movement
 2020-07-06 16:13:55 +05:30
Anupam K
8b26ea720b Merge branch 'develop' of https://github.com/frappe/erpnext into number-card-filter-fix 2020-07-06 15:21:53 +05:30
rohitwaghchaure
71e1d2cc79
Merge pull request #22563 from AndyOverLord/patch-6 
fix: fetch item price in sales invoice
 2020-07-06 14:18:03 +05:30
Deepesh Garg
05738bd29a fix: Remove print statements 2020-07-06 13:40:48 +05:30
rohitwaghchaure
661bc46b81
Merge pull request #22571 from marination/quality-feedback 
fix: Quality Feedback and Template (minor)
 2020-07-06 13:17:10 +05:30
rohitwaghchaure
1cc1fd4f86
Merge pull request #22576 from marination/party-details 
fix: Check for Company before trying to fetch party details
 2020-07-06 12:42:16 +05:30
Deepesh Garg
92a03aa5db Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-07-06 12:37:28 +05:30
rohitwaghchaure
e5d9ebe32e
Merge pull request #22577 from deepeshgarg007/coa_fiscal_year_fix 
fix: Consider company fiscal year for getting balance
 2020-07-06 12:34:56 +05:30
Anupam K
e88f2bb053 number card filter 2020-07-06 12:34:05 +05:30
Marica
7e198527b9
Merge branch 'develop' into party-details 2020-07-06 11:09:20 +05:30
Saqib
819879dd12
Merge branch 'develop' into asset-delete-fix 2020-07-05 18:38:51 +05:30
Deepesh Garg
be05c4e14a fix: Codacy and minor fixes 2020-07-05 18:16:16 +05:30
Deepesh Garg
4993ab5191
Merge branch 'develop' into develop 2020-07-04 18:28:06 +05:30
rohitwaghchaure
3292e63dee
Merge pull request #22569 from rohitwaghchaure/fixed-travis-failing-due-to-loan-issue 
fix: travis
 2020-07-04 14:14:52 +05:30
Rohit Waghchaure
f0f4f70a76 fix: test case for salary slip 2020-07-04 13:30:22 +05:30
Deepesh Garg
96d40ec9da fix: Consider company fiscal for getting balalnce 2020-07-03 22:59:00 +05:30
marination
e27b996e38 fix: Check for Company before trying to fetch party details 2020-07-03 22:12:00 +05:30
Deepesh Garg
62181707ee
Merge pull request #22574 from deepeshgarg007/uae_item_tax_fix 
fix: Update item tax only if item code available
 2020-07-03 21:25:28 +05:30
Deepesh Garg
04661a4e15 fix: Update item tax only if item code available 2020-07-03 21:23:23 +05:30
Rohit Waghchaure
2cbf598b4b fix: travis 2020-07-03 20:15:18 +05:30
Deepesh Garg
d7adacd3e2 feat: Added all companies option in employee tree to view employee accress all companies 2020-07-03 18:39:51 +05:30
marination
8e62035991 fix: Quality Feedback and Template (minor) 2020-07-03 16:19:55 +05:30
mohammadahmad1990
405b20884b fix: patch 2020-07-03 15:15:27 +05:00
mohammadahmad1990
b2725577b2 Patch file updated 2020-07-03 15:06:36 +05:00
mohammadahmad1990
f933cf80df Patch for Updating item Tax Template Company 2020-07-03 15:04:37 +05:00
mohammadahmad1990
261ecba3d6 Company field removed from Item Taxes Table 2020-07-03 15:04:28 +05:00
mohammadahmad1990
ad3d44d622 fix: Item Tax Template check on company field 2020-07-03 15:02:39 +05:00
mohammadahmad1990
015910b4c4 Company Field Added in Item Tax Template 2020-07-03 15:02:32 +05:00
mohammadahmad1990
728bf0e6dd fix: Item Tax Template 2020-07-03 15:02:16 +05:00
mohammadahmad1990
e39649bc9e fix: Item Tax Template with no validity 2020-07-03 15:02:03 +05:00
mohammadahmad1990
41c0c9f46b fix: Item Tax Template 2020-07-03 15:01:49 +05:00
Deepesh Garg
9ed0384bea fix: Code cleanup 2020-07-03 14:54:41 +05:30
sahil28297
32d7ff7b34
Merge branch 'develop' into fix_develop_version 2020-07-03 11:48:22 +05:30
Deepesh Garg
271ccff77d
Merge pull request #22564 from deepeshgarg007/loan_doc_cleanup 
fix: Remove loan security field from loan
 2020-07-03 09:34:56 +05:30
Andy Zhu
b60abb0158
fix: fetch item price in sales invoice 
When create standalone sales invoice, the item price will not be created fetch.
By adding "posting_date" to dict: item_price_args, it will be fetch on building the condition of SQL.
 2020-07-03 14:13:15 +12:00
Deepesh Garg
30d9101cbf fix: Remove loan security field from loan 2020-07-02 23:39:12 +05:30
Deepesh Garg
3c004ad798 fix(GST): Do not add tax amount in grand total for reverse charge invoices 2020-07-02 21:18:29 +05:30
Afshan
bfffd9b01b
made "Subscription Section", "Auto Repeat" and Hub Publishing" collapsible by default (#22521) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-02 15:11:45 +05:30
Khushal Trivedi
49d04f449e
fix: no else condition required since we can decalre it by default (#22537) 
* fix: removing unnecessary else condition on customer form

* fix: removing unnecessary else condition on customer form

* fix: no else condition required since we can decalre it by default

Co-authored-by: Khushal Trivedi <khushalt5@gmail.com>
 2020-07-02 14:51:20 +05:30
Chinmay D. Pai
ed0bb20e6f
chore: add query functions to whitelist 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-07-02 12:35:41 +05:30
Chinmay D. Pai
aa1210921b
fix: whitelist all query functions for search widget 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-07-01 21:14:32 +05:30
Marica
484a681e0c
Merge branch 'develop' into FR_ISS_204863 2020-07-01 11:29:03 +05:30
Sahil Khan
f278425c01 bumped to version 13.0.0-beta.3 2020-06-30 19:06:02 +05:50
Michelle Alva
ec84afa86d
fix: Refactor dashboard links in leave policy (#22519) 
* fix: refactor dashboard links in leave policy

* fx: code fix

* fix: add labels to links

* fix: code change
 2020-06-30 18:04:20 +05:30
Sahil Khan
ad4eb649a2 chore: set develop version as 13.x.x 2020-06-30 17:54:41 +05:30
Anurag Mishra
8f2cb0beb6 fix: set half day date None if half day is unchecked 2020-06-30 12:11:03 +05:30
mergify[bot]
dca65de1b6
fix: Salary deductions report fixes (bp #22397) (#22520) 
* feat: added year filters

(cherry picked from commit d0d9b53361)

* Fix: if there is no component

(cherry picked from commit f9ca29cebd)

* fix: test_tax_for_payroll_period

(cherry picked from commit ece9508eb5)

Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
 2020-06-30 11:45:40 +05:30
Nabin Hait
7813cabfd3 chore: Added Change Log 2020-06-30 11:35:41 +05:30
mergify[bot]
7db00dde2d
fix: Dashboard label in Projects and Assets module (#22517) (#22518) 
(cherry picked from commit fdbd10f193)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-30 09:33:18 +05:30
Nabin Hait
fdbd10f193
fix: Dashboard label in Projects and Assets module (#22517) 2020-06-30 09:25:17 +05:30
mergify[bot]
e0388a169a
fix: manufacturing dashboard grammar (#22510) (#22516) 
* fix: manufacturing dashboard grammar

* Update manufacturing.json

(cherry picked from commit 7056cd3782)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2020-06-30 08:57:26 +05:30
Marica
7ca8022b8f
fix: Set Root as Parent if no parent in new tree view node (#22508) 2020-06-30 08:20:58 +05:30
Marica
0efda4e457
fix: Added Missing Trends Reports to Buying/Selling Desk (#22509) 
* fix: Added Missing Trends Reports to Buying/Selling Desk

* fix: Move Reports to Other Reports
 2020-06-30 08:20:35 +05:30
rohitwaghchaure
7056cd3782
fix: manufacturing dashboard grammar (#22510) 
* fix: manufacturing dashboard grammar

* Update manufacturing.json
 2020-06-30 08:20:03 +05:30
Afshan
06f11aba0b feat: Autofill Supplier pop-up when only 1 Supplier in RFQ 2020-06-29 21:39:35 +05:30
Deepesh Garg
8230e41a42 fix: Insert instead of DB insert 2020-06-29 21:20:05 +05:30
Deepesh Garg
d1bf6e0277 fix: Do not ignore validate methods on GLL entry submit 2020-06-29 21:14:03 +05:30
mergify[bot]
9cba6bddde
fixes: Payroll module pre relese test fixes (#22500) (#22506) 
* fix: salary payment based on payments

* fix: bank remittance report

* fix: Payroll period onboarding

* fix: provident-fund-deductions report

* fix: Considered unmarked days

* fix: onboarding paYroll

* feat: quick entry in payroll entry

(cherry picked from commit c2523e8453)

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2020-06-29 20:07:57 +05:30
Anurag Mishra
c2523e8453
fixes: Payroll module pre relese test fixes (#22500) 
* fix: salary payment based on payments

* fix: bank remittance report

* fix: Payroll period onboarding

* fix: provident-fund-deductions report

* fix: Considered unmarked days

* fix: onboarding paYroll

* feat: quick entry in payroll entry
 2020-06-29 19:54:23 +05:30
Marica
510436931b
fix: Added Missing Trends Reports to Buying/Selling Desk (#22502) 
* fix: Added Missing Trends Reports to Buying/Selling Desk

* fix: Move Reports to Other Reports
 2020-06-29 19:52:23 +05:30
mergify[bot]
c312b3af13
fix: job offer validation fix (#22504) (#22505) 
(cherry picked from commit 343651fc39)

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2020-06-29 19:10:57 +05:30
mergify[bot]
47a3524a7d
fix: Stock Onboarding typo and reorder (#22499) (#22503) 
(cherry picked from commit 8732b8caf6)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-29 18:24:25 +05:30
Anurag Mishra
343651fc39
fix: job offer validation fix (#22504) 2020-06-29 18:23:22 +05:30
Marica
3e93a2f67f
fix: Set Root as Parent if no parent in new tree view node (#22497) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-29 17:39:26 +05:30
Marica
8732b8caf6
fix: Stock Onboarding typo and reorder (#22499) 2020-06-29 17:38:42 +05:30
Anurag Mishra
ba5f571b0d
fix: take parent cost center for child if no cost center at child (#22496) 2020-06-29 17:35:27 +05:30
Saqib
41034f760d
Merge branch 'develop' into asset-delete-fix 2020-06-29 10:54:01 +05:30
Saqib Ansari
cc42aa1750 fix: cancel asset movement on asset cancellation 2020-06-29 10:33:24 +05:30
Mangesh-Khairnar
73edba0e10
fix: handle nonetype issue for packed items (#22493) 2020-06-29 08:54:53 +05:30
Deepesh Garg
a74cffe7a4
Merge pull request #21047 from vishdha/feat_taxjar 
feat(ERPNext Integrations): Taxjar Integration Added
 2020-06-28 23:01:37 +05:30
Deepesh Garg
23c64c0b3a
Merge pull request #22487 from frappe/mergify/bp/version-13-beta-pre-release/pr-21690 
fix(regional): DATEV report (bp #21690)
 2020-06-28 21:38:58 +05:30
Deepesh Garg
50e6e47e66 fix: Patch 2020-06-28 21:32:08 +05:30
rohitwaghchaure
6acde987c5
Merge pull request #22488 from rohitwaghchaure/fixed-letter-head-not-found 
fix: letter head not found in opening invoice creation tool
 2020-06-28 20:02:29 +05:30
Deepesh Garg
eca2c1cd93 fix: patch 2020-06-28 18:53:55 +05:30
Rucha Mahabal
67608c3179
Merge pull request #22476 from ruchamahabal/fix-custom-status-v13 
fix: handle custom statuses for the pause SLA configuration
 2020-06-28 17:32:25 +05:30
Rohit Waghchaure
04cf2e029f fix: letter head not found in opening invoice creation tool 2020-06-28 17:08:12 +05:30
barredterra
7df5de9468 fix: hide transaction-specific for master data 
(cherry picked from commit 30d194d8a7)
 2020-06-28 11:29:48 +00:00
barredterra
8f7d214853 fix: customer and supplier data 
(cherry picked from commit 53445aa25a)
 2020-06-28 11:29:48 +00:00
barredterra
6adb617ede fix: truncate account names to max length 
(cherry picked from commit 2976831560)
 2020-06-28 11:29:48 +00:00
barredterra
3efe0d0e83 refactor: query meta data only once 
(cherry picked from commit 55c048f56c)
 2020-06-28 11:29:47 +00:00
barredterra
cf53305abb fix(report view): explicitly set column width for 
(cherry picked from commit 7a7add5001)
 2020-06-28 11:29:47 +00:00
Deepesh Garg
4c230ed4b0
Merge pull request #21690 from alyf-de/refactor_datev 
fix(regional): DATEV report
 2020-06-28 16:55:18 +05:30
Deepesh Garg
c8b11143a1
Merge pull request #22445 from Alchez/dev-job-offer-list-view 
fix: setup status indicators for Job Offer and Job Applicant (develop)
 2020-06-28 16:49:28 +05:30
rohitwaghchaure
e4d296bb1c
Merge pull request #22413 from Anurag810/salary-structure-help-fix 
fix: 'Condition & Formula Help' appears twice
 2020-06-28 16:29:20 +05:30
rohitwaghchaure
7e3f10e5bc
Merge pull request #22397 from Anurag810/salary_deductions_report_fixes 
fix: Salary deductions report fixes
 2020-06-28 16:27:37 +05:30
rohitwaghchaure
81af2235f4
Merge branch 'develop' into dev-job-offer-list-view 2020-06-28 15:25:32 +05:30
rohitwaghchaure
41cd4fc788
Merge pull request #22478 from michellealva/cost_center_filter 
fix: apply filters in all transactions
 2020-06-28 15:10:13 +05:30
rohitwaghchaure
4cc2e70348
Merge pull request #22454 from wojosc/patch-10 
refactor: update customs_tariff_number.json
 2020-06-28 15:07:19 +05:30
rohitwaghchaure
69aa2e400a
Merge pull request #22412 from frappe/mergify/bp/version-13-beta-pre-release/pr-22223 
feat: Accounting entries for service item in Purchase receipt (bp #22223)
 2020-06-28 11:26:21 +05:30
rohitwaghchaure
cc2d7f3e7f
Merge pull request #22450 from marination/serial-no-rename 
fix: Disable Renaming in Serial No
 2020-06-28 11:15:35 +05:30
rohitwaghchaure
d5736711ce
fix: indentation 2020-06-28 11:12:20 +05:30
rohitwaghchaure
2f4971b5a6
Merge pull request #22461 from britlog/develop 
fix: product_info
 2020-06-28 11:05:26 +05:30
Deepesh Garg
1d8b13c943
Merge pull request #22483 from deepeshgarg007/loan_security_shorttfall_fixes 
fix: Loan security shortfall fixes
 2020-06-27 18:57:14 +05:30
Deepesh Garg
a4b9fc74aa
Merge branch 'develop' into feat_taxjar 2020-06-27 18:51:48 +05:30
Deepesh Garg
589364856c fix: Syntax Error 2020-06-27 18:44:36 +05:30
Michelle Alva
2f37c447dd
fix: change button label in issue 
Changed the label of the button from "Make" to "Create" so that it is consistent with other DocTypes.

Before:
 2020-06-27 09:27:45 +05:30
Marica
92bea1326a
Merge branch 'develop' into serial-no-rename 2020-06-26 20:34:09 +05:30
michellealva
08f842d12e fix: apply filters in all transactions 2020-06-26 19:56:00 +05:30
michellealva
e9cec2ff76 fix: remove redundant label in salary slip 2020-06-26 19:39:54 +05:30
britlog
0086a3727f fix: product_info 2020-06-26 15:30:27 +02:00
Rucha Mahabal
5dd4bcb229 fix: set total hold time only if hold configurations are enabled 2020-06-26 18:22:24 +05:30
Rucha Mahabal
28c1e8ef77 fix: handle hold time for custom statuses 2020-06-26 18:21:53 +05:30
rohitwaghchaure
275ebefdd2
Merge pull request #22468 from frappe/shopping-cart-settings 
fix: enable show_configure_button when shopping cart is enabled
 2020-06-26 17:20:35 +05:30
mergify[bot]
fce39f706d
fix: Send email to credit controllers to increase credit limit (#22473) 
(cherry picked from commit 0ff5af222a)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-26 16:21:56 +05:30
rohitwaghchaure
b2ae6d9961
Merge pull request #22467 from nabinhait/credit_limit_email 
fix: Send email to credit controllers to increase credit limit
 2020-06-26 15:49:25 +05:30
rohitwaghchaure
13e8c32172
Update shopping_cart_settings.js 2020-06-26 15:07:32 +05:30
marination
0f056ec51d fix: Sales Order to MR test failing 2020-06-26 14:12:11 +05:30
Wolfram Schmidt
a97715e464
Update customs_tariff_number.json 2020-06-26 10:24:48 +02:00
Anupam K
0ce70bd68f Merge branch 'develop' of https://github.com/frappe/erpnext into shopping-cart-settings 2020-06-26 12:47:37 +05:30
Nabin Hait
0ff5af222a fix: Send email to credit controllers to increase credit limit 2020-06-26 12:46:42 +05:30
Anupam K
27d27c924d enable show_configure_button when shopping cart is enabled 2020-06-26 12:46:40 +05:30
rohitwaghchaure
cc7e1b0ec5
Merge pull request #22400 from AfshanKhan/FR_ISS_204290 
fix: removed condition that considered "Standard working hours" while…
 2020-06-25 23:23:33 +05:30
rohitwaghchaure
2eb452f3bb
Merge pull request #22458 from scmmishra/fix-email-digest-so-company 
fix: add company filter in email digest
 2020-06-25 23:18:38 +05:30
rohitwaghchaure
6cf568d094
Merge pull request #22462 from marination/production-plan-ux 
fix: Handling Empty tables in Production Plan
 2020-06-25 23:15:28 +05:30
Michelle Alva
978722621f
fix: grammatical fix on error message 
Before:

Fiscal Year: 2020 does not exists

After:

Fiscal Year 2020 Does Not Exist
 2020-06-25 22:35:33 +05:30
marination
c8f590bc8f fix: Handling Empty tables in Production Plan 2020-06-25 21:30:45 +05:30
Shivam Mishra
5374e7ae1f fix: add company filter in email digest 2020-06-25 19:41:42 +05:30
Wolfram Schmidt
7f2a3e8c7d
Update customs_tariff_number.json 
Main information of tariff numbers are the number. A description is more or less double information as this is mostly the number. Thus a description should not be mandetory.
 2020-06-25 13:56:32 +02:00
marination
f311f52f6e fix: Disable Renaming in Serial No 2020-06-25 16:02:18 +05:30
Saqib
40847aeac3
fix: cannot cancel assets with repair pending (#22440) 
* fix: cannot cancel assets with repair pending

* fix: message

* Update asset.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-25 15:43:31 +05:30
Deepesh Garg
4c726b25ee
fix: Add view ledger button for cancelled docs (#22433) 
* fix: Add view ledger button for cancelled docs

* fix: Add moddified to date in Stock Ledger
 2020-06-25 15:37:04 +05:30
Deepesh Garg
8a55ec1580
fix: Add view ledger button for cancelled docs (#22432) 
* fix: Add view ledger button for cancelled docs

* fix: Add moddified to date in Stock Ledger
 2020-06-25 15:34:01 +05:30
Sun Howwrongbum
ecff8f9582
fix: UnboundLocalError when setting product_info (#22436) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-25 14:25:53 +05:30
Afshan
a462e29172
Merge branch 'develop' into FR_ISS_204290 2020-06-25 14:16:35 +05:30
Rohan Bansal
e7c91917aa fix: setup status indicators for Job Offer and Job Applicant 2020-06-25 13:40:18 +05:30
Rucha Mahabal
7b3700b3ec
fix: handle custom statuses for the pause SLA configuration (#22349) 
* fix: handle hold time for custom statuses

* fix: set total hold time only if hold configurations are enabled

Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
 2020-06-25 13:29:14 +05:30
Saqib Ansari
acdaf2b001 fiix: cannot cancel asset and asset movement 2020-06-25 12:43:25 +05:30
Shivam Mishra
53346217d2
Revert "feat: added search to support page (#22376)" (#22431) 
This reverts commit 3ab8d865dd.
 2020-06-25 11:12:09 +05:30
Michelle Alva
da0385cd39
fix: change error messages in RFQ 
Before:
1. Row {0}: For supplier {0} Email Address is required to send email
2. Email sent to supplier
3. Request for Quotation is disabled to access from portal, for more check portal settings.
4. Supplier Quotation created.


After:
1. Row {0}: For Supplier {0} Email Address is Required to Send Email
2. Email sent to Supplier
3. The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.
4. Supplier Quotation Created.
 2020-06-25 08:24:01 +05:30
John Clarke
6fd1068af3
Update stock_ageing.py 2020-06-24 07:31:21 -06:00
Deepesh Garg
be9a8e1a14 Resolve merge conflicts 2020-06-24 18:47:58 +05:30
Deepesh Garg
faa0c5624e fix: Update journal entry account timestamp 2020-06-24 18:45:16 +05:30
Deepesh Garg
06a37660ae
Merge pull request #22421 from deepeshgarg007/update_jv_account_timestamp 
fix: Update journal entry accounts times stamp
 2020-06-24 17:56:51 +05:30
Deepesh Garg
2abd66da9d fix: Update journal entry account timesstamp 2020-06-24 17:49:50 +05:30
Anurag Mishra
2f867ca357
Merge branch 'develop' into salary-structure-help-fix 2020-06-24 17:41:32 +05:30
Anupam Kumar
10c7faf090
updating education report modified time (#22418) 
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2020-06-24 17:34:52 +05:30
vishdha
d3ec1c1d89 feat: Taxjar Integration Added 2020-06-24 16:37:21 +05:30
Shivam Mishra
3ab8d865dd
feat: added search to support page (#22376) 
* feat: added search to support page

* style: add styles in style block
 2020-06-24 15:50:06 +05:30
Anurag Mishra
020c6e9175 fix: Create salary slip button disappears 2020-06-24 15:22:45 +05:30
Afshan
a07a548622 fix: removed "standard working hours" also fixed test cases 2020-06-24 13:07:59 +05:30
Anurag Mishra
a81c54f23a fix: 'Condition & Formula Help' appears twice 2020-06-24 11:51:06 +05:30
Deepesh Garg
51ce1e1d4e fix: Test Cases 
(cherry picked from commit ded3ab1cd7)
 2020-06-24 05:38:33 +00:00
Deepesh Garg
12f1f8e111 fix: Move check from Stock Settings to Company Master 
(cherry picked from commit 53d5d16abb)
 2020-06-24 05:38:33 +00:00
Deepesh Garg
6e2ca779c5 feat: Accounting entries for service item in Purchase receipt 
(cherry picked from commit c258ac82c5)
 2020-06-24 05:38:32 +00:00
rohitwaghchaure
a50c95c959
Merge pull request #22223 from deepeshgarg007/grn_posting 
feat: Accounting entries for service item in Purchase receipt
 2020-06-24 11:00:19 +05:30
rohitwaghchaure
c4382abc03
Merge pull request #22410 from kennethsequeira/item_report_date 
fix: add error prompt for wrong date range
 2020-06-24 10:49:21 +05:30
rohitwaghchaure
d63c59ced4
Merge branch 'develop' into grn_posting 2020-06-24 10:23:23 +05:30
Nabin Hait
b90194970d fix: Merge conflict 2020-06-23 20:01:24 +05:30
Marica
7af7bb8311
fix: Insert Supplier Group via List View (#22403) 2020-06-23 17:51:02 +05:30
Rohan
9c25101d9b
feat: add ability for a contract to be authorised internally (#22095) 
* Added ability for a contract to be signed by a company user before being sent out

* feat: contract signed by stays even after reload (#402)

* format: use new JSON format

Co-authored-by: Neil Lasrado <neil@digithinkit.com>
Co-authored-by: nehasacher143 <45919049+nehasacher143@users.noreply.github.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-23 17:39:37 +05:30
Kenneth Sequeira
f5b7bd9dcb fix: add error prompt for wrong date range 2020-06-23 16:55:35 +05:30
Anurag Mishra
ecbfda7d6a
fix: typo in template(#22401) 2020-06-23 14:33:49 +05:30
Anurag Mishra
ece9508eb5 fix: test_tax_for_payroll_period 2020-06-23 14:25:43 +05:30
Afshan
4e37d25374 fix: removed condition that considered "Standard working hours" while creating "timesheet" as it was setting wrong time #20848 2020-06-23 14:10:40 +05:30
Anurag Mishra
f9ca29cebd Fix: if there is no component 2020-06-23 11:57:02 +05:30
Anurag Mishra
d0d9b53361 feat: added year filters 2020-06-23 11:49:57 +05:30
Anoop
5e16ca0326
fix: Login page doesn't load for new sites (#22388) 
* fix: Login page doesn't load for new sites

Login page broken as active domains are not set for new sites

* Update footer_powered.html

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-23 11:11:13 +05:30
Anurag Mishra
101d15f2f8
fix: not working without from_amount and percentage_deduction (#22380) 2020-06-23 10:45:54 +05:30
Anurag Mishra
36560c8406
fix: staffing Plan validation (#22379) 2020-06-23 10:44:33 +05:30
mergify[bot]
ca8894b0fc
fix: alternative item not working for subcontract (#22386) 
(cherry picked from commit 171699537c3e7d7632f45123c6d30012c8de7281)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2020-06-23 10:42:32 +05:30
Marica
3dee5273d6
fix: Update Packed Items via Update Items in SO (#22392) 2020-06-23 10:33:47 +05:30
Marica
bd5c8573de
fix: Unable to create batched Item (#22393) 2020-06-23 10:32:51 +05:30
Deepesh Garg
7cc1cf36ca
feat: More controlled deferred revenue booking (#21671) 
* feat: More controller deferred revenue booking

* fix: Query for last gl entry

* fix: Accounting Dimension for Deferred entries

* fix: Deferred revenue booking against paid invoices

* fix: Don not update outstanding on Deferred Entry submission

* fix: Naming fixes

* feat: Deferred revenue/expense booking based on months

* fix: Test case for fix monthly deferred revenue booking

* fix: Typo

* fix: Patch to update settings

* fix: Test case to book deferred expense via journal entry

* fix: Update field for better UX

* fix: Codacy

* fix: Change select field to checkbox
 2020-06-23 09:57:56 +05:30
Raffael Meyer
c3e91be48e
Merge branch 'develop' into refactor_datev 2020-06-22 19:53:47 +02:00
Suraj Shetty
c753502412
Merge branch 'develop' into patch-1 2020-06-22 21:41:31 +05:30
rohitwaghchaure
b658a010f1
Merge pull request #22383 from frappe/mergify/bp/develop/pr-22330 
fix(pricing_rule): apply_on logic dont get cleanup (bp #22330)
 2020-06-22 21:08:55 +05:30
Deepesh Garg
49f51f4132
Merge pull request #22346 from AfshanKhan/ISS_20_21_02455 
fix: set row_id by default as previous row for On Previous Row Amount and On Previous Row Total
 2020-06-22 20:53:23 +05:30
Rohit Waghchaure
aaed3b988f added validation and clear fields for Apply Rule On Other 
(cherry picked from commit ebbbc85fc0f9aa418163f8344d3a234ecbe08488)
 2020-06-22 14:52:30 +00:00
Poranut Chollavorn
e3973a4730 fix(pricing_rule): apply_on logic dont get cleanup 
(cherry picked from commit acf399c4e0c74458c17866be7d72788aeecbe829)
 2020-06-22 14:52:29 +00:00
Deepesh Garg
5dc175f068
fix(Immutable Ledger): Item wise backdated stock entry posting (#22366) 
* fix(Immutable Ledger): Item wise backdated stock entry posting

* fix: Remove fiscal year query

* fix: Update message string
 2020-06-22 19:05:39 +05:30
Deepesh Garg
c914d1b8e8
Merge branch 'develop' into ISS_20_21_02455 2020-06-22 18:46:58 +05:30
Anupam Kumar
71da90034d
fix: resetting lost reason in opportunity and quotation (#22378) 2020-06-22 18:27:14 +05:30
Deepesh Garg
be4fc1a78e
fix(UX): Notify user of expense account change in Purchase Invoice (#22193) 2020-06-22 18:03:11 +05:30
Anurag Mishra
7672166ce3
fix: Wrong filter (#22375) 2020-06-22 17:22:05 +05:30
Anurag Mishra
0093b3b27c
fix: label (#22377) 2020-06-22 17:21:01 +05:30
Deepesh Garg
0252cb6789
Merge pull request #22374 from deepeshgarg007/employee_advance_cancel 
fix: Unable to cancel employee advance
 2020-06-22 14:55:21 +05:30
Deepesh Garg
62897d3878 fix: Unable to cancel employee advance 2020-06-22 14:54:01 +05:30
Anurag Mishra
8ffb9f852f
fix: patch check_is_income_tax_component (#22371) 2020-06-22 12:17:29 +05:30
rohitwaghchaure
39a7516252
Merge pull request #22241 from deepeshgarg007/cost_center_fix 
fix: Minor fixes in cost center
 2020-06-22 11:21:14 +05:30
Alvaro
43be163b32
feat: Enabled translation on html files in LMS [Proposal] (#21582) 
* :fix:  translation fix for html files in LMS

* fix: typo in translation

* Update content.html

* Update content.html

* Update profile.html

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-22 11:06:12 +05:30
Deepesh Garg
d79e8e82cb fix: Test cases 2020-06-22 10:00:12 +05:30
Deepesh Garg
edd4aa6faa Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-06-22 09:59:39 +05:30
Deepesh Garg
ded3ab1cd7 fix: Test Cases 2020-06-22 09:40:15 +05:30
Deepesh Garg
7f94765d02
Merge pull request #22350 from AfshanKhan/ISS_20_21_02392 
fix: Skipping total row for tree-view reports
 2020-06-21 19:25:59 +05:30
Afshan
84c6973742 fix: adding json for checked add total row 2020-06-21 17:48:44 +05:30
Deepesh Garg
95a497cffb Merge branch 'develop' of https://github.com/frappe/erpnext into cost_center_fix 2020-06-20 12:33:41 +05:30
Deepesh Garg
bef80b7981 fix: Test 2020-06-20 12:32:30 +05:30
Deepesh Garg
dee1c92df1
Merge pull request #22351 from kennethsequeira/purchase_inv_due 
fix: status error in purchase invoice
 2020-06-20 11:58:19 +05:30
Deepesh Garg
c70eb30e7e Merge branch 'develop' of https://github.com/frappe/erpnext into grn_posting 2020-06-20 11:56:25 +05:30
Deepesh Garg
53d5d16abb fix: Move check from Stock Settings to Company Master 2020-06-20 11:55:56 +05:30
Afshan
3fbe6e9e4b fix: test case 2020-06-19 22:51:52 +05:30
Kenneth Sequeira
b7c8037e9a fix codacy 2020-06-19 22:33:51 +05:30
Anurag Mishra
289c82243f
feat: New Payroll module (#21990) 
* feat: Moved Document to Payroll Module

* feat: Moved Reports to Payroll Module

* feat: Moved Print fromat With Patch

* feat: Moved Notifiction to Payroll Module and patches

* feat: added dashboard and desk page to Payroll

* feat: Payroll Dashboard

* feat: Module onboarding

* feat: Income tax Deductions Report

* feat: Ecs Checklist Report

* feat: Provident Fund Report

* feat: Professional Fund report and commonified Code

* feat: Total Payments Based On Payment Mode Report

* fix: refactor and added chart Total Payments Based On Payment Mode

* feat: Payroll Settings

* fix: Bank remittance Report

* feat(Payroll based on): Considered unmarked days

* feat: Added Help for condition an formula in Salary structure

* fix: requested changes

* fix: rename report Ecs checklist to salary_payments_via_ecs

* fix: renamed report report/total_payments_based_on_payment_mode

* fix: added role via setup.py for regional report

* feat: added All reports to desk page

* fix: frappe.reload doc in all patches

* fix: codacy

* fix: frappe.reload_doctype for patches

* patch: is_income_tax_component and component_type for salary component

* fix: uncommented code

* test: fixture

* fix: test

* test: test_payment_days_based_on_attendance
 2020-06-19 19:17:57 +05:30
Marica
47a4567301
Merge branch 'develop' into purchase_inv_due 2020-06-19 18:44:53 +05:30
Kenneth Sequeira
02f3e045ab fix: due date filter in purchase invoice 2020-06-19 18:22:04 +05:30
Afshan
65f00cea15 fix: Skipping* 2020-06-19 18:19:06 +05:30
Afshan
fbd66574ad Skiping total row for tree-view reports 2020-06-19 18:17:01 +05:30
Deepesh Garg
aea450c36a
Revert "fix: update remark on submitting payment entry" 2020-06-19 17:29:49 +05:30
Afshan
aca2ca5982 style: formate according to Codacy/PR Quality Review 2020-06-19 16:22:41 +05:30
Marica
383807f72e
feat: Selling Desk, Dashboard and Onboarding (#22055) 
* feat: Selling Desk, Dashboard and Onboarding

* chore: Selling Onboarding and fixes in Other onboardings

* chore: Dashboard and Number card Fixtures

* fix: Escape filters and Reposition Accounts Dashboard shortcut.

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-19 15:33:21 +05:30
Afshan
0fe14ce94e style: formate according to Codacy/PR Quality Review 2020-06-19 15:10:15 +05:30
Afshan
6f7652f425 fix: set row_id by default as previous row for On Previous Row Amount and On Previous Row Total 2020-06-19 14:36:56 +05:30
Afshan
7a45c8bc28 fix: replaced "row_id" to "idx" as "row_id" was not available in variable "tax", also replaced "-1" by "-2" as "idx" starts with 0 rather than 1 2020-06-19 12:37:50 +05:30
Deepesh Garg
1b30ca6a36 fix: Codacy 2020-06-19 12:12:08 +05:30
Deepesh Garg
163a569715 chore: Delete Bank Reco doctype 2020-06-19 12:03:36 +05:30
Deepesh Garg
3c63f5b76b Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-06-19 11:41:21 +05:30
Deepesh Garg
23cb5e1869
Merge pull request #22312 from frappe/email-digest-html 
fix: Email digest html view fix
 2020-06-19 11:36:02 +05:30
Rucha Mahabal
428235c478
fix: revert issue metrics patch (#22331) 2020-06-19 11:15:59 +05:30
Afshan
a9cdc7b696
style: moved project from reference section to accounting dimensions section (#22309) 2020-06-19 11:11:33 +05:30
rohitwaghchaure
a504bdb448
Merge pull request #22329 from scmmishra/fix-grammar-footer 
refactor: show service instead of services
 2020-06-19 10:59:52 +05:30
rohitwaghchaure
ec2dec03cc
Merge pull request #22334 from kennethsequeira/item-sale-hist 
fix: Customer Group label in Item-wise Sales History report
 2020-06-19 10:53:09 +05:30
Kenneth Sequeira
766f978858 fix: Customer Group label in Itemwise Sales report 2020-06-18 23:23:54 +05:30
rohitwaghchaure
9d25826bbe
Merge pull request #22249 from marination/rfq-multi-uom 
feat: Multi UOM support in Request for Quotation
 2020-06-18 20:48:13 +05:30
Shivam Mishra
e892448733
Merge branch 'develop' into fix-grammar-footer 2020-06-18 14:21:03 +00:00
Shivam Mishra
25702a1c55 refactor: show service instead of services 2020-06-18 19:49:46 +05:30
Anurag Mishra
d9b2d635d8
feat: added Expense approver for employee and validation (#22244) 
* feat: added Expense approver for employee nad validation

* fix: requested changes
 2020-06-18 19:13:01 +05:30
Prssanna Desai
82ddef58c0
feat: date filter for fiscal year (#21880) 
* feat: date filter for fiscal year

* fix: rename fieldtypes to valid_for_fieldtypes

* Update utils.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-18 18:18:41 +05:30
Anupam Kumar
77673e27e0
enable Lead create by email (#22314) 
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2020-06-18 17:46:20 +05:30
Deepesh Garg
bdb40553c3
Merge pull request #22323 from deepeshgarg007/item_tax_map 
fix: Do not copy Item Tax template from SO to PO
 2020-06-18 17:01:53 +05:30
Deepesh Garg
1ba7708b60 fix: Do not copy Item Tax template from SO to PO 2020-06-18 16:45:16 +05:30