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

32788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
barry86m
5b381ac5b7
fix: consolidated financial statement sums values into wrong parent 
fix proposed by Andriesvn in bug report

closes #22180
 2020-09-08 00:27:57 +01:00
Deepesh Garg
b828e2fcf4
Merge pull request #23287 from deepeshgarg007/lsu_api_fix 
fix: Only submitted Loan security pledges should be approved
 2020-09-07 23:23:55 +05:30
Deepesh Garg
03b0ad4f98 fix: Only submitted Loan security pledges should be approved 2020-09-07 23:22:21 +05:30
Anupam Kumar
22bd03e63c
Merge branch 'develop' into item-group-filter-portal 2020-09-07 20:20:42 +05:30
Rucha Mahabal
4673bed67e fix: codacy issues 2020-09-07 20:12:29 +05:30
Rucha Mahabal
06f89a1b94 fix: Set student email id mandatory only if skip user creation is disabled 2020-09-07 19:46:53 +05:30
marination
f18dd05c00 fix: Missing import and typo 2020-09-07 18:59:57 +05:30
Marica
54ab426c1c
Merge branch 'develop' into youtube-analytics 2020-09-07 18:54:11 +05:30
marination
06ee0ea00b feat: Added Scheduler Job to auto update statistics 
- Added frequency in Video Settings
- Cron job to check half hourly job
- Hourly job to run job based on frequency
- Patch to set youtube id in video for ease in computing
 2020-09-07 18:49:06 +05:30
Deepesh Garg
74ab1084b3 fix: Apply TDS on Purchase Invoice creation from Purchase Order and Purchase Receipt 2020-09-07 17:55:10 +05:30
Deepesh Garg
af1c4ba443
Merge pull request #23279 from deepeshgarg007/loan_closure_interest 
fix: Pending loan interest accrual on loan closure
 2020-09-07 15:01:33 +05:30
Deepesh Garg
afefa878b0 fix: Pending loan interest accrual on loan closure 2020-09-07 14:57:44 +05:30
Deepesh Garg
da6074a84c fix: Pending loan interest accrual on loan closure 2020-09-07 14:55:04 +05:30
marination
9ce38de439 chore: Key Validation and restructure 
- Added API Key validation in Video Settings
- Moved Statistics section above description in Video
- Moved id retrieving from URL to py side
- Removed js side calls, added section toggling in js
- Restructured Code
 2020-09-07 13:27:17 +05:30
Mangesh-Khairnar
06130ee56b
fix: leave ledger patch (#23182) 2020-09-07 11:53:50 +05:30
Anupam Kumar
209f7c76c9
feat: added transaction_type in leave ledger enter (#23258) 2020-09-07 11:50:24 +05:30
barry86m
fa98e81f0b
fix: sql error on saving sales invoice without a sales order 2020-09-07 01:36:15 +01:00
Anupam Kumar
ffd30beeca
Merge branch 'develop' into item-group-filter-portal 2020-09-06 21:48:16 +05:30
rohitwaghchaure
937b63433d
Merge pull request #23270 from kasgel/patch-1 
fix(utils): pass stock_qty to get_pricing_rule_for_item
 2020-09-06 20:46:15 +05:30
Deepesh Garg
c0fb7cb189
Merge pull request #23272 from deepeshgarg007/loan_repayment_method 
fix: Repayment Method not visible correctly
 2020-09-05 21:19:31 +05:30
Deepesh Garg
5158d0fbba fix: Repayment Method not visible correctly 2020-09-05 21:16:57 +05:30
kasgel
a59f8640d1
fix: pass stock_qty to get_pricing_rule_for_item 
get_pricing_rule_for_item uses the "stock_qty" and "qty" arguments to filter pricing rules.
Not passing stock_qty prevents for example the shopping cart from filtering pricing rules appropriately based on Quantity.
 2020-09-05 12:15:49 +02:00
Deepesh Garg
8e4ae0af56
Merge pull request #23269 from deepeshgarg007/loan_security_unpledge_utility 
fix: API changes in loan security unpledge utility
 2020-09-04 22:44:03 +05:30
Deepesh Garg
1b4ed454d2 fix: Add reference no and descripiton field in Loan Security Pledge and Unpledge 2020-09-04 22:42:41 +05:30
Deepesh Garg
e4c38e5fe5 fix: Remove print statement 2020-09-04 22:30:13 +05:30
Deepesh Garg
4d636fde3a fix: API changes in loan security unpledge utility 2020-09-04 22:23:30 +05:30
Mangesh-Khairnar
7456ffca0f fix: teardown created payment order 2020-09-04 19:59:01 +05:30
Mangesh-Khairnar
a76bf4d7af fix: remove unused imports 2020-09-04 19:08:08 +05:30
Mangesh-Khairnar
d9e4883392 test: check payment order creation against payment entry 2020-09-04 18:55:14 +05:30
rohitwaghchaure
515d8b9e50
Merge pull request #23259 from anupamvs/se-quntity 
fix: SE quantity data type issue
 2020-09-04 16:07:13 +05:30
rohitwaghchaure
c9a5afaa1c
Merge pull request #23263 from Semiranis/uom_after_qty 
feat: Option to print UOM after quantity
 2020-09-04 16:06:46 +05:30
Shivam Mishra
a2655fda8d
Merge pull request #23261 from scmmishra/rzp-api 
feat: don't allow guests
 2020-09-04 15:19:21 +05:30
Shivam Mishra
4a238a2093 feat: don't allow guests 2020-09-04 15:18:16 +05:30
Anupam K
faebef21b7 fix: SE quantity data type issue 2020-09-04 15:09:16 +05:30
Mangesh-Khairnar
e1889d0c1b fix(payment entry): update payment order status 2020-09-04 14:45:19 +05:30
Mangesh-Khairnar
8d8af94182 fix: capture advance payments in payment order 2020-09-04 12:17:56 +05:30
Marica
059ade81b2
Merge pull request #23249 from marination/leaderboard-supplier 
fix: Supplier Leaderboard
 2020-09-04 11:27:25 +05:30
Frappe ERPnext
2e8e06c350 Merge branch 'develop' of https://github.com/frappe/erpnext into uom_after_qty 2020-09-03 18:08:02 +02:00
Frappe ERPnext
9355641c49 refactor: logic moved to standard template 
Previously print_settings.py controller decided which template to use.
Now standard template decides what to print according to settings.
 2020-09-03 17:31:21 +02:00
Frappe ERPnext
a5d5e70bf4 Revert "feat: Option to print UOM after quantity" 
This reverts commit a787882a8f.
 2020-09-03 17:30:25 +02:00
Marica
8d6b2d016f
Merge branch 'develop' into leaderboard-supplier 2020-09-03 20:08:37 +05:30
marination
2a56000460 fix: Supplier Leaderboard fix 2020-09-03 19:45:04 +05:30
Deepesh Garg
b306fa355d
Merge pull request #23248 from deepeshgarg007/pda_account_filter 
fix: Account filter in Process Deferred Accounting doctype
 2020-09-03 19:22:56 +05:30
rohitwaghchaure
e399a8e82c
Merge pull request #23242 from rohitwaghchaure/incorrect-qty-after-transaction-stock-reco-develop 
fix: incorrect qty after transaction in stock ledger entry
 2020-09-03 18:59:24 +05:30
Deepesh Garg
9b681770d0 fix: Account filter in Process Deferred Accounting doctype 2020-09-03 18:09:02 +05:30
Anurag Mishra
e5b7cb0c15 fix: data was not properly maped 2020-09-03 16:59:21 +05:30
gavin
72e53842c4
Merge pull request #23237 from frappe/dependabot/npm_and_yarn/bl-3.0.1 
chore(deps): bump bl from 3.0.0 to 3.0.1
 2020-09-03 16:08:22 +05:30
gavin
21985d4ecc
Merge branch 'develop' into dependabot/npm_and_yarn/bl-3.0.1 2020-09-03 15:31:41 +05:30
gavin
f20b6360de
Merge branch 'develop' into overlap_for_additional_salary 2020-09-03 15:27:58 +05:30
Anurag Mishra
7952f89596 feat: Overlap validation additional salary 2020-09-03 15:21:35 +05:30