Deepesh Garg
c33412b6ae
feat: Link blanket order and quotation
2020-03-30 22:44:13 +05:30
Deepesh Garg
f0760dee80
Merge branch 'develop' of https://github.com/frappe/erpnext into customer-doctype-issue
2020-03-30 15:05:34 +05:30
Deepesh Garg
56bc36f9e2
fix: Test cases
2020-03-30 15:05:20 +05:30
Deepesh Garg
f144b8b205
Merge branch 'develop' into po_supplier_skip
2020-03-30 13:07:03 +05:30
Deepesh Garg
647529651d
Merge pull request #21067 from Alchez/dev-add-issue-status-filter
...
feat: add status filter in issue web form (develop)
2020-03-30 12:23:20 +05:30
Deepesh Garg
025762f395
Merge pull request #21119 from rohitwaghchaure/fixed_parent_account_error_while_adding_equity_account_develop
...
fix: not able to add equity account in the chart of accounts
2020-03-30 12:15:01 +05:30
Deepesh Garg
a47e42c515
Merge pull request #21087 from nabinhait/item_defaults_fix_dev
...
fix: Add item defaults based on global settings only if default company and warehouse is mentioned
2020-03-29 21:55:25 +05:30
Deepesh Garg
fe1f754d83
Merge pull request #21110 from nextchamp-saqib/cancel-error-hyperlink
...
chore: hyperlinks in cannot cancel message
2020-03-29 21:53:43 +05:30
Deepesh Garg
e0a4a32460
Merge pull request #21115 from nextchamp-saqib/course-report-perm-fix
...
fix: cannot view report for course doctype - permission problem
2020-03-29 21:51:15 +05:30
Rohit Waghchaure
cdf80eb4ad
fix: not able to add equity account in the chart of accounts
2020-03-29 16:35:10 +05:30
Saqib Ansari
0f6d372182
fix: cannot view report for course doctype - permission problem
2020-03-29 12:52:16 +05:30
Deepesh Garg
f528aef49c
Merge pull request #21089 from scmmishra/print-format-fix
...
fix: total currency formatting in Acc Receivable and Payable
2020-03-28 21:27:56 +05:30
Deepesh Garg
1a2cf5cabe
fix: get_party_gle_currency failing if customer_name or supplier_name is passed
2020-03-28 21:26:16 +05:30
Deepesh Garg
c6b850eacb
fix: Improve message
2020-03-28 21:17:58 +05:30
Deepesh Garg
f9f39f5a7e
Merge pull request #21103 from nextchamp-saqib/stock-ledger-warehouse-filter
...
chore: [ux] filter warehouse based on company
2020-03-28 21:09:46 +05:30
Saqib Ansari
b345fe0fe9
chore: hyperlinks in cannot cancel message
2020-03-28 20:11:26 +05:30
Saqib Ansari
ed3553f795
chore: [ux] filter warehouse based on company
2020-03-28 19:12:59 +05:30
Deepesh Garg
b5c6412ed4
Merge pull request #21101 from nextchamp-saqib/gl-entry-currency-fix
...
fix: currency formatting in gl entry dr cr field
2020-03-28 18:56:49 +05:30
Saqib Ansari
c1678203f1
fix: currency formatting in gl entry dr cr field
2020-03-28 16:39:22 +05:30
Saqib Ansari
0ec01d98d6
fix: payment request status fixes
2020-03-28 16:11:23 +05:30
rohitwaghchaure
2d5addafa7
Merge pull request #21099 from anupamvs/item-wise-sales-history-billed-amount-bug
...
bug: Item-wise Sales History - Billed amount
2020-03-28 15:05:41 +05:30
Rohit Waghchaure
e7c4565483
fix: item code showing as mandatory even if the 'Item Naming By' is set as Naming Series in stock settings
2020-03-28 14:59:00 +05:30
Anupam K
85aae7de0b
bug: Item-wise Sales History - Billed amount
2020-03-28 14:13:58 +05:30
Saqib Ansari
8488ef8eb1
fix: customer group price list not fetched in pos
2020-03-28 14:07:09 +05:30
Deepesh Garg
c12a8040ef
Merge branch 'develop' into item_defaults_fix_dev
2020-03-27 21:51:00 +05:30
Deepesh Garg
e86f6d0738
Merge branch 'develop' into print-format-fix
2020-03-27 21:39:16 +05:30
Deepesh Garg
55e9bcb964
Merge pull request #21013 from frappe/sahil28297-patch-1
...
fix: develop version as 12.0.0-dev instead of 12.2.0
2020-03-27 21:26:26 +05:30
Shivam Mishra
71fb8e8b57
fix: use setup from Supplier Quotation Controller
2020-03-27 20:47:04 +05:30
Nabin Hait
fe000e20e8
fix: Add item defaults based on global settings only if default company and warehouse is mentioned
2020-03-27 19:24:47 +05:30
Shivam Mishra
cf6a814328
fix: total currency formatting
2020-03-27 19:15:59 +05:30
Deepesh Garg
c5f40d9072
Merge branch 'develop' into sahil28297-patch-1
2020-03-27 18:43:13 +05:30
rohitwaghchaure
0fc8b2af60
Merge pull request #21077 from rohitwaghchaure/default_item_is_not_coming_while_making_new_bom_develop
...
fix: item not showing in popup while making batch
2020-03-27 13:49:23 +05:30
Rohit Waghchaure
a5357c2e27
fix: item not showing in popup while making batch
2020-03-27 12:59:02 +05:30
Deepesh Garg
ba10630f27
Merge pull request #20905 from Thunderbottom/demo-fixed-asset-fix
...
fix: remove make_purchase_invoice from demo script
2020-03-27 11:32:45 +05:30
Deepesh Garg
3a639ea187
Merge branch 'develop' into demo-fixed-asset-fix
2020-03-27 11:31:53 +05:30
Deepesh Garg
8404f4649e
Merge pull request #21075 from deepeshgarg007/loan_test_fix
...
fix: Randomly failing loan repayment test
2020-03-27 11:24:01 +05:30
Deepesh Garg
88898abe6c
fix: Randomly failing loan repayment test
2020-03-27 10:27:15 +05:30
Rohan Bansal
da54719b43
feat: add status filter in issue web form
2020-03-26 16:08:03 +05:30
Anupam K
7ca28fdab5
fix: Adding proper error message
2020-03-26 15:54:15 +05:30
marination
815c36a4eb
fix: Updated Bin Requested Qty logic
2020-03-26 15:46:27 +05:30
Rohan
ea182051d3
fix: consumed qty values in work order
2020-03-26 15:32:01 +05:30
Deepesh Garg
d74bcad7af
fix: Added hidden GL column in general ledger ( #21021 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-03-26 13:37:40 +05:30
Nabin Hait
fafba10219
fix: Ignored user permission for parent_company and existing_company field in Company ( #21009 )
2020-03-26 13:36:40 +05:30
Marica
38cba153b5
fix: Make shelf life mandatory in Batched Item if it has expiry date ( #21044 )
2020-03-26 13:29:02 +05:30
Raffael Meyer
89cac5af16
fix(regional): encoding of DATEV report ( #21059 )
2020-03-26 13:25:58 +05:30
Marica
b856aae651
fix: Project field in Stock Entry Detail should be editable ( #20999 )
2020-03-26 13:23:49 +05:30
Saqib
74864b3b61
fix: currency not fetched on quotation creation ( #20996 )
2020-03-26 13:20:31 +05:30
Saqib
faea85451f
feat: auto set batch no on serial no selection ( #20757 )
...
* feat: auto set batch no on serial no selection
* fix: dialog not shown if set warehouse selected
* fix: typo
* fix: merge conflict
* fix: callback no getting called after serial no selected
* fix: available batch qty not fetched without set_warehouse selected
* fix: item batch not synced with dialog batch table
2020-03-26 13:18:57 +05:30
Nabin Hait
1aa8c2ecc4
fix: delete contact email and phone along with contact
2020-03-26 13:15:31 +05:30
Nabin Hait
ced6898fd7
fix: Ignored user permission for parent_company and existing_company field in Company
2020-03-26 12:30:29 +05:30
