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

23597 Commits

Author SHA1 Message Date
Saqib
7126e179c3 fix: button click event not working in POS custom fields (#23358) 2020-09-22 16:35:11 +05:30
Mangesh-Khairnar
27f81e06ea fix: create custom pos fields 2020-09-15 14:38:06 +05:30
Mangesh-Khairnar
757fa5d010 fix(shopping-cart-settings): filter payment gateway accounts 2020-09-14 17:44:51 +05:30
Mangesh-Khairnar
40d3add63c feat(payment-gateway-account): add additional payment channel 2020-09-14 15:14:36 +05:30
Mangesh-Khairnar
2dabd2182f feat: add mpesa integration 2020-09-10 17:05:43 +05:30
Saqib
ec6a97fb6a
fix: cannot delete pos page if linked with desk page (#22993) 
* fix: cannot delete pos page if linked with desk page

* fix: replace pos page links with point-of-sale page

Co-authored-by: gavin <gavin18d@gmail.com>
 2020-09-09 10:54:14 +05:30
Deepesh Garg
dc84633860
Merge pull request #23301 from deepeshgarg007/closed_loan_amount 
fix: Amount for closed loans
 2020-09-08 21:32:54 +05:30
Deepesh Garg
846e6d4803 fix: Add test 2020-09-08 21:32:06 +05:30
Deepesh Garg
f247686ace fix: Amount for closed states 2020-09-08 21:26:06 +05:30
Saqib
8f43cf2c9a
fix: asset movement date for backdated asset entry (#23298) 2020-09-08 17:44:47 +05:30
rohitwaghchaure
93dccd2eaa
Merge pull request #23132 from anupamvs/item-group-filter-portal 
fix: [Portal] added filter show in website
 2020-09-08 17:03:54 +05:30
rohitwaghchaure
1d555f35a7
Merge pull request #23282 from deepeshgarg007/tds_bug 
fix: Apply TDS on Purchase Invoice creation from Purchase Order and Purchase Receipt
 2020-09-08 16:59:29 +05:30
Anupam Kumar
09e2cb5f87
Merge branch 'develop' into item-group-filter-portal 2020-09-08 14:54:31 +05:30
Deepesh Garg
f7731b0715 fix: TDS applicable on creating PI from get items button 2020-09-08 13:41:04 +05:30
Afshan
12ab8ebc95 fix: removed ignore permission flag 2020-09-08 12:55:42 +05:30
Marica
c8eca9d5f3
Merge branch 'develop' into handle-irs 2020-09-08 12:03:45 +05:30
Rucha Mahabal
f7619df8b2
fix: Lock row in subquery while setting delivered qty (#23100) 2020-09-08 11:57:45 +05:30
Afshan
9691422fb7
feat: added report for mismatch in serial nos and stock quantity in warehouse (#22669) 
* feat: added report for mismatch in serial nos and stock quantity in warehouse

* style: removed print statement

* fix: rename of reports and refactor of code

* fix: handled null condition for actual qty and added report link in stock desk page

* style: breaking code in multiple lines
 2020-09-08 11:57:15 +05:30
rohitwaghchaure
31fd90136d
Merge pull request #23243 from Anurag810/overlap_for_additional_salary 
feat: Overlap validation additional salary
 2020-09-08 10:18:41 +05:30
rohitwaghchaure
7d7fa79efa
Update additional_salary.py 2020-09-08 10:18:18 +05:30
rohitwaghchaure
900d0e3ae2
Merge pull request #23245 from Anurag810/attendance_calendar_map 
fix: Attendance calendar map fix
 2020-09-08 10:14:37 +05:30
rohitwaghchaure
842cb6d1d6
Update shift_assignment.py 2020-09-08 10:14:04 +05:30
Anupam Kumar
7131024bf9
Merge branch 'develop' into item-group-filter-portal 2020-09-08 10:04:51 +05:30
rohitwaghchaure
0cb805308f
Merge pull request #23256 from Mangesh-Khairnar/fix-adv-payment-payment-order 
fix: capture advance payments in payment order
 2020-09-08 09:59:47 +05:30
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
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
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
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
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
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
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