Shivam Mishra
affa2fba6b
feat: updated non-profit.json
2020-04-13 13:42:01 +05:30
Shivam Mishra
31051679c8
feat: remove unused fields
2020-04-07 18:43:11 +05:30
Shivam Mishra
65e11a9640
refactor: razorpay subscription for memberships
2020-04-07 14:49:28 +05:30
Shivam Mishra
8d6cded07f
feat: added subscription web hook
2020-04-06 15:01:30 +05:30
Shivam Mishra
d92b7ab258
fix: use false explicitly
2020-04-06 14:44:33 +05:30
Shivam Mishra
4b667160a0
feat: added razorpay details to membership
2020-04-06 14:44:17 +05:30
Shivam Mishra
3a2c8560ba
feat: update desk page for Non Profits
2020-03-30 18:15:51 +05:30
Shivam Mishra
28fafd0dda
feat: setup subscription API
2020-03-30 18:15:37 +05:30
Shivam Mishra
1281634306
feat: client code to handle razorpay fields
2020-03-30 18:15:22 +05:30
Shivam Mishra
1d6395c5cf
feat: add PAN details field to member for India
2020-03-30 18:14:44 +05:30
Shivam Mishra
e836cdec13
feat: update member and membership doctype
2020-03-30 18:14:10 +05:30
Shivam Mishra
1f20f6348d
feat: added membership settings doctype
2020-03-30 18:13:29 +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
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
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
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
Anupam K
85aae7de0b
bug: Item-wise Sales History - Billed amount
2020-03-28 14:13:58 +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
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
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
Deepesh Garg
5fbada75fa
Merge pull request #21038 from anupamvs/error-message-changes
...
fix: add better error message
2020-03-26 11:56:34 +05:30
Deepesh Garg
9062ce5191
fix: Spacing and indentations
2020-03-26 11:56:03 +05:30
Deepesh Garg
92e0fb7a27
Merge pull request #20653 from P-Froggy/develop
...
feat: Move SWIFT-number and branch-code from bank account to bank
2020-03-25 21:52:42 +05:30
Deepesh Garg
bdcfab3a0f
fix: Update patch and bank form cleanup
2020-03-25 21:32:10 +05:30
Deepesh Garg
3cf70a6e79
Merge branch 'develop' of https://github.com/frappe/erpnext into P-Froggy-develop
2020-03-25 21:00:25 +05:30
Anupam K
10b7a51805
Better error message
2020-03-25 18:21:42 +05:30
Deepesh Garg
ca3bf8f917
Merge pull request #21057 from deepeshgarg007/gstr_1_pos_validation
...
fix: Place of supply validation in GSTR-1 report
2020-03-25 17:02:10 +05:30
Deepesh Garg
113c6c86b7
fix: Remove debug
2020-03-25 16:54:17 +05:30
Deepesh Garg
878e4fbcf8
fix: Place of supply validation in GSTR-1 report
2020-03-25 16:52:07 +05:30
rohitwaghchaure
b6bb56e9bf
Merge pull request #21037 from rohitwaghchaure/fixed_batch_selector_popup_develop
...
fix: batch selection popup not coming for stock entry
2020-03-24 16:32:21 +05:30
Deepesh Garg
da6fb435dd
Merge pull request #21041 from deepeshgarg007/default_dimension_clean_up
...
fix: Default dimension set code cleanup
2020-03-24 15:47:51 +05:30
Deepesh Garg
4e3fbf5a8b
fix: Default dimension set code cleanup
2020-03-24 15:43:21 +05:30
