Commit Graph

33019 Commits

Author SHA1 Message Date
Deepesh Garg
d86b7c5537 fix: Remove repayment type 2020-10-11 00:37:34 +05:30
Deepesh Garg
6dccf79250 fix: Add accrual type and penalty field in interest accrual 2020-10-10 23:32:57 +05:30
Deepesh Garg
6d27adccfc fix: Button to close loan 2020-10-10 23:28:39 +05:30
Deepesh Garg
51c6cf692e fix: Add method for loan closure 2020-10-10 23:20:36 +05:30
Saqib Ansari
3d91d48b77 fix: validate only for stock transactions 2020-10-10 21:56:50 +05:30
rohitwaghchaure
ad9db89514
Merge pull request #23573 from deepeshgarg007/opening_jv
fix: Opening Journal Entry via Data Import
2020-10-10 13:16:41 +05:30
Deepesh Garg
e9c1098f5f
Merge pull request #23566 from michellealva/sales_team
fix: Change name of Sales Team table
2020-10-10 12:14:00 +05:30
rohitwaghchaure
1bcd84450c
Merge pull request #23560 from deepeshgarg007/regional_doctypes_desk
fix: Add lower deduction certificate in desk page
2020-10-10 11:23:26 +05:30
rohitwaghchaure
01e23264a6
Merge pull request #23557 from KanchanChauhan/issue#23475-2
feat: Supplier Sourced Items in BOM
2020-10-10 11:17:53 +05:30
rohitwaghchaure
5065f8ac83
Merge pull request #23545 from tundebabzy/develop
fix: pass self.flags.ignore_permissions to the ignore_permissions
2020-10-10 11:11:57 +05:30
rohitwaghchaure
04ddf24ffe
Merge pull request #23572 from marination/payment-entry-list-view
fix: Check if list view standard filter exists in Payment Entry
2020-10-10 11:09:31 +05:30
rohitwaghchaure
9333a1dd54
Merge pull request #23570 from nextchamp-saqib/si-dashboard-fix
fix: (revert) Add Delivery Note Count in Sales Invoice Dashboard
2020-10-10 11:08:37 +05:30
rohitwaghchaure
ea8ea4abb5
Merge pull request #23569 from marination/prod-order-reference-in-item
fix: Remove Production Order reference from Item Validation
2020-10-10 11:03:26 +05:30
Kanchan Chauhan
654c36ea99 feat: Supplier Sourced Items in BOM 2020-10-09 22:05:03 +05:30
Deepesh Garg
2676f96203 fix: Opening Journal Entry via Data Import 2020-10-09 21:58:38 +05:30
marination
07731c7735 fix: Check if list view standard filter exists in Payment Entry 2020-10-09 21:44:23 +05:30
Saqib
56fea7d243
fix: update items after submission ignores precision (#23491)
* fix: update items after submission ignores precision

* chore: add test
2020-10-09 21:19:25 +05:30
Saqib Ansari
d927c8efba fix: (revert) Add Delivery Note Count in Sales Invoice Dashboard 2020-10-09 21:00:33 +05:30
marination
bd6d5eb5ac fix: Remove Production Order reference from Item Validation 2020-10-09 20:57:17 +05:30
michellealva
1bc7fc41a5 fix: Change name of Sales Team table 2020-10-09 16:01:13 +05:30
Saqib Ansari
776d8f72cf chore: do not allow future transactions 2020-10-09 15:36:11 +05:30
Anupam
22dc42efb9 fix: error log while creating company 2020-10-09 14:58:39 +05:30
Tunde Akinyanmi
f2b12a3b9c Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-10-09 07:20:19 +01:00
Rucha Mahabal
a6dc7833f6
Merge pull request #23537 from michellealva/missing_links
fix: Add links in Stock desk page
2020-10-09 11:46:14 +05:30
Deepesh Garg
5e6ea36938 fix: Add lower deduction certificate in desk page 2020-10-08 20:32:36 +05:30
Rohit Waghchaure
a86cab0bb2 fix: added patch to make custom field 'Print UOM after Quantity' 2020-10-08 16:41:23 +05:30
Deepesh Garg
c837b5f48c
Merge pull request #23014 from abhishekbalam/pricing_rule_on_condition
feat(Accounts): Add Condition Field In Pricing Rule
2020-10-08 16:32:21 +05:30
Abhishek Balam
783cdc1c1f
Merge pull request #23523 from michellealva/budget
fix(Budget): Change options in select field
2020-10-08 16:27:31 +05:30
Abhishek Balam
6d1af84fef
Merge branch 'develop' into budget 2020-10-08 16:23:36 +05:30
Deepesh Garg
8242da6310 Merge branch 'develop' of https://github.com/frappe/erpnext into stock_entry_conversion_factor 2020-10-08 16:23:34 +05:30
rohitwaghchaure
242bae4a81
Merge pull request #23548 from michellealva/selling_links
fix(Selling): Add missing reports on desk
2020-10-08 11:24:46 +05:30
Saqib
22b4c86a38
fix: cannot merge pos invoices with inclusive tax (#23541)
* fix: cannot merge pos invoices with inclusive tax

* fix: item rate calculation
2020-10-08 11:23:21 +05:30
michellealva
38aee6e3cb fix(Selling): Add missing reports on desk 2020-10-08 10:24:11 +05:30
Tunde Akinyanmi
4010196488 fix: pass self.flags.ignore_permissions to the ignore_permissions
argument of Address and Contact controller
2020-10-08 02:25:09 +01:00
Rucha Mahabal
d4c80abb6d
Merge pull request #23542 from kennethsequeira/student-app-nat
fix: remove default nationality as Indian in Student Applicant webform
2020-10-07 23:26:31 +05:30
Kenneth Sequeira
0b84a6399b fix: remove default nationality as Indian 2020-10-07 23:14:27 +05:30
Marica
82cb47fea0
Merge pull request #23533 from frappe/fix_title_customer_name
fix: use party name as title
2020-10-07 20:49:21 +05:30
Kenneth Sequeira
be0ebc5085 spell fixes for Condition 2020-10-07 20:47:12 +05:30
Marica
71db253b86
Merge branch 'develop' into fix_title_customer_name 2020-10-07 20:27:32 +05:30
Abhishek Balam
ebf53a7f25
fix(HR): Appraisal form Enhancements (#23500)
* fix: remove total score button

* Removing conflicts
2020-10-07 19:59:26 +05:30
michellealva
3525ddabc5 fix: Add links in Stock desk page 2020-10-07 19:02:19 +05:30
barredterra
242579b77c fix: use party name as title 2020-10-07 14:34:21 +02:00
Marica
bd775cbf26
Merge pull request #23529 from michellealva/acocunts_settings_fix
fix: Typo in Accounts Settings
2020-10-07 15:22:15 +05:30
michellealva
a9c2401a2d fix: Typo in Accounts Setings 2020-10-07 15:13:57 +05:30
Abhishek Balam
937308854a
Merge branch 'develop' into pricing_rule_on_condition 2020-10-07 13:35:53 +05:30
Raffael Meyer
2acfc2a034
Merge branch 'develop' into validate_regional_germany 2020-10-06 16:53:52 +02:00
Deepesh Garg
b16e447f86
Merge pull request #23352 from deepeshgarg007/tax_fetch_quote
fix: Taxes not getting fetched from Opportunity to Quotation
2020-10-06 19:55:21 +05:30
michellealva
203585f292 fix(Employee): Field level change in Exit section 2020-10-06 16:00:39 +05:30
michellealva
2e425efae8 fix: blank option in the beginning 2020-10-06 15:15:29 +05:30
michellealva
a2aae5644e fix(Budget): Change options in select field 2020-10-06 15:02:01 +05:30