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
|
750069b6de
|
Merge pull request #22544 from Thunderbottom/whitelist-query
fix: whitelist all query functions for search widget
|
2020-07-07 15:52:02 +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 |
|
rohitwaghchaure
|
93732ae21b
|
Merge pull request #22598 from AfshanKhan/fix-cost-center-option-for-expense-claim
fix: cost center should only show option of selected company
|
2020-07-07 12:24:56 +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
|
4bff9d8663
|
Merge pull request #22527 from sahil28297/fix_develop_version
chore: set develop version as 13.x.x
|
2020-07-03 11:48:48 +05:30 |
|