Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,847 Commits 3 Branches 0 Tags 1 GiB
05458b7fc6
Commit Graph

25847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Basawaraj Savalagi
05458b7fc6 Fixed Company Abbr Update Was Not Able To Update Account 2019-04-10 13:33:43 +05:30
Rushabh Mehta
3882a41c51 fix(dashboard): simpler way to get account timeline from first principles 2019-04-08 19:05:12 +05:30
Rushabh Mehta
fbc56c6d97 fix(style): left padding in marketplace view 2019-04-08 17:02:22 +05:30
Mangesh-Khairnar
1934a76cd8 feat: Add status field in multiple reports linked with purchase order and sales order creation (#17107) 
* enhancement: add status field in ordered itemd to be delivered

* enhancement: add status field in purchase order itemd to be received

* enhancement: add a status column in the billed reports
 2019-04-08 16:29:59 +05:30
rohitwaghchaure
bc02ee23e0
Merge pull request #17078 from rohitwaghchaure/unlinked_advance_payment_on_cancellation_of_order 
feat: provision to unlink advance payment entry on cancelation of order
 2019-04-06 12:30:05 +05:30
Rohit Waghchaure
9835c89e17 Added test cases 2019-04-06 12:29:05 +05:30
Nabin Hait
398e4b9472 fix: Ignore item tax patch if old schema does not exists 2019-04-05 16:41:17 +05:30
Nabin Hait
e6ee43b102
Merge pull request #17145 from Mangesh-Khairnar/salary-register-doj 
feat: add date of joining column in salary register
 2019-04-05 16:02:48 +05:30
Nabin Hait
374b85b38e
Merge pull request #17140 from hrwX/pe_supp_inv_v12 
fix(Payment Entry): Return Bill No on for Payment Entry
 2019-04-05 15:59:58 +05:30
Nabin Hait
9302a19d74
Merge pull request #17135 from hrwX/validate_stock_transaction_v12 
fix(Item): check transactions for batch, serial check
 2019-04-05 15:40:19 +05:30
Mangesh-Khairnar
e7d53540de feat: add doj column in salary register 2019-04-05 12:56:11 +05:30
John Clarke
b733984ca1 fix: Remove duplicate Timesheet item (#17066) 2019-04-05 11:02:25 +05:30
rohitwaghchaure
fc471ed63b
Merge pull request #17142 from rohitwaghchaure/incorrect_pos_profile_selected_develop 
fix: incorrect POS profile selected
 2019-04-05 09:59:16 +05:30
Rohit Waghchaure
c2ed03f77a always set the company from the POS Profile 2019-04-05 09:58:04 +05:30
Rohit Waghchaure
e8e3fb175d fix: incorrect POS profile selected 2019-04-05 09:57:52 +05:30
rohitwaghchaure
cbdd3304a4
Merge pull request #17138 from rohitwaghchaure/search_items_not_works_in_the_pos 
fix: POS search items not works properly if item group filter has applied
 2019-04-05 00:45:53 +05:30
cjpit
0c87895afc fix(node_modules): remove hardcoded symlink (#16975) 
* add node_modules directory to gitignore

* remove node_modules symlink
 2019-04-05 00:12:26 +05:30
Himanshu Warekar
b30f584410 fix: return bill_no 2019-04-04 19:55:13 +05:30
Rohit Waghchaure
0a4aee0206 fix: POS search items not works properly if item group filter has applied 2019-04-04 16:02:15 +05:30
rohitwaghchaure
0a57ef4bea
Merge pull request #17134 from rohitwaghchaure/not_able_to_change_pos_profile 
fix: not able to change pos profile
 2019-04-04 15:42:28 +05:30
Himanshu Warekar
cdd79e3c40 fix: check transactions for batch, serial check 2019-04-04 15:26:35 +05:30
Rohit Waghchaure
55d3bcac37 fix: not able to change pos profile 2019-04-04 15:26:00 +05:30
Nabin Hait
9087efa5be
Merge pull request #17131 from Anurag810/desk-fixes 
fix: desk for selling module, sales invoice now avaialble at module page (WN-SUP41771).
 2019-04-04 11:49:56 +05:30
Nabin Hait
b861c4bc46
Merge pull request #16895 from Alchez/hotfix-shipping-charge-override 
fix(transaction): Fix shipping rule charge override by tax template
 2019-04-04 11:48:48 +05:30
Nabin Hait
94c822f5f0
Merge pull request #17022 from hrwX/cost_center_fix 
fix(Purchase Invoice): Cost Centre as per company
 2019-04-04 11:43:44 +05:30
Anurag Mishra
76795aa086 fix: desk for selling module sales invoice now avaialble at module page 2019-04-04 11:38:42 +05:30
Nabin Hait
a8c7e39a71
Merge pull request #17128 from hrwX/typo_fix_v12 
fix(Issue): typo fix for Status
 2019-04-04 11:24:16 +05:30
Himanshu Warekar
5ccc4731d0 fix: typo fix 2019-04-04 11:02:05 +05:30
Nabin Hait
fdf52a82d6
Merge pull request #17127 from rmehta/warehouse-account-fix-develop 
fix(kaizen): warehouse account description
 2019-04-04 10:50:42 +05:30
Nabin Hait
3149596b53
Merge pull request #17102 from hrwX/hsn_india_v12 
fix(India): HSN Code
 2019-04-04 10:49:55 +05:30
Nabin Hait
b652421a54
Merge pull request #17106 from nabinhait/loan-link 
fix: Added link for loan in HR module page
 2019-04-04 10:49:37 +05:30
Rushabh Mehta
3720e64506 fix(kaizen): warehouse account description 2019-04-04 09:02:41 +05:30
Rushabh Mehta
43257c8cc3 fix(rename): Help Desk => Support 2019-04-02 08:59:15 +05:30
rohitwaghchaure
c0435f21c2
Merge pull request #17098 from rohitwaghchaure/incorrect_calculation_of_imponibile_importo_develop 
fix: incorrect  calcualtion of ImponibileImporto if tax rate is zero
 2019-04-01 23:15:17 +05:30
Nabin Hait
9d431a8a83 fix: Added link for Expense Claim in HR module page 2019-04-01 21:06:12 +05:30
Nabin Hait
948cc631c6 fix: Added link for loan in HR module page 2019-04-01 20:58:20 +05:30
Himanshu Warekar
656d8e4557 fix(India): HSN Code 2019-04-01 19:38:43 +05:30
Rohit Waghchaure
58f489fec8 fix: calcualtion of ImponibileImporto if tax rate is zero 2019-04-01 18:18:27 +05:30
Deepesh Garg
6b320bea81
fix: GSTR3b test case fix (#17094) 2019-04-01 17:55:01 +05:30
rohitwaghchaure
235dc4fb62
Merge pull request #17093 from rohitwaghchaure/improved_online_pos_performance 
fix: pos takes more time to add an item in the cart
 2019-04-01 16:46:37 +05:30
Rohit Waghchaure
6f3f2185ab fix: pos takes more time to add an item in the cart 2019-04-01 16:45:47 +05:30
rohitwaghchaure
f4d8457905
Merge pull request #17090 from rohitwaghchaure/pos_qty_decrement_not_working 
fix: POS qty decrement freezing the screen
 2019-04-01 14:57:33 +05:30
Rohit Waghchaure
e994494e3e fix: POS qty decrement freezing the screen 2019-04-01 14:29:55 +05:30
rohitwaghchaure
451f25d5c2
Merge pull request #17081 from rohitwaghchaure/fix_pos_pricing_rule_code_cleanup 
fix: code cleanup
 2019-04-01 10:53:52 +05:30
Rohit Waghchaure
614f5adf6d fix: code cleanup 2019-04-01 10:53:08 +05:30
Rohit Waghchaure
5fa9a7a1b4 feat: unlink advance payment entry on cancelation of order 2019-04-01 00:40:38 +05:30
rohitwaghchaure
48bca9fbf2
Merge pull request #17076 from rohitwaghchaure/pricing_rule_pos_develop_issues_fixed 
fix: Pricing rule not working for POS
 2019-03-31 21:56:37 +05:30
Rohit Waghchaure
70b996af73 fix: test cases 2019-03-31 20:34:52 +05:30
Rohit Waghchaure
e540534e42 fix: Pricing rule not working for POS 2019-03-31 17:13:18 +05:30
Nabin Hait
04399e6621
Merge pull request #17073 from nabinhait/stock-report-fix 
fix(stock): Fixed stock balance and stock ledger report
 2019-03-30 17:05:51 +05:30