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

25546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aditya Hase
8896374413 feat(dashboard): Add timespan filter 2019-03-12 14:47:20 +05:30
Aditya Hase
953229fa47 feat(dashboard): Create Accounting dashboard from General Ledger Report 2019-03-12 14:47:20 +05:30
Faris Ansari
2221151132
fix: Update Training Level 2019-03-12 10:55:11 +05:30
rohitwaghchaure
94561607f0
Merge pull request #16893 from rohitwaghchaure/stock_ledger_report_not_working_v12 
fix: stock ledgre report not working
 2019-03-11 14:52:17 +05:30
Rohit Waghchaure
267723f57b fix: stock ledgre report not working 2019-03-11 14:06:00 +05:30
Frappe Bot
7e67a400cd Merge branch 'master' into develop 2019-03-08 09:39:33 +00:00
Frappe Bot
2ae018a653 Merge branch 'hotfix' 2019-03-08 09:39:33 +00:00
Frappe Bot
3406229152 bumped to version 11.1.14 2019-03-08 09:39:32 +00:00
Nabin Hait
9ec4816b32
Update item_barcode_childtable_migrate.py 2019-03-08 10:44:13 +05:30
Rushabh Mehta
703a597478 fix(patch): update customization options if completed is not present 2019-03-07 13:03:40 +05:30
Rushabh Mehta
e9db0d2c61 fix(minor): update task list label from Closed to Completed 2019-03-07 12:50:02 +05:30
rohitwaghchaure
d4754619d0
Merge pull request #16806 from rohitwaghchaure/set_scanned_barcode_in_the_table 
fix: scan barcode not adding the barcode value in the items table
 2019-03-07 11:29:56 +05:30
rohitwaghchaure
d06212e408
Merge pull request #16853 from rohitwaghchaure/pos_profile_changes 
fix: POS profile, account for change amount must be cash or bank account
 2019-03-07 11:28:25 +05:30
Rohit Waghchaure
db8500c03a POS profile, account for change amount must be cash or bank account 2019-03-06 18:28:45 +05:30
Rushabh Mehta
29c46bb311 fix(sales_order.py): handle zero bundle qty 2019-03-06 14:49:13 +05:30
Prateeksha Singh
6e28ef425a
Merge pull request #16845 from hrwX/additional_salary_develop 
fix(Additional Salary): Additional salary develop
 2019-03-05 17:49:23 +05:30
Himanshu Warekar
250ebe5888 Merge branch 'develop' of https://github.com/frappe/erpnext into additional_salary_develop 2019-03-05 17:45:14 +05:30
Himanshu Warekar
219b9f4150 Salary Component can be equal to zero 2019-03-05 17:44:07 +05:30
Prateeksha Singh
fb491a568f
Merge pull request #16842 from hrwX/additional_salary 
fix(Additional Salary): Allow additional salary to be zero
 2019-03-05 17:34:37 +05:30
Prateeksha Singh
e2e4028b39
Merge pull request #16844 from deepeshgarg007/desktop 
fix: Removed shortcuts from desktop.py
 2019-03-05 17:23:52 +05:30
deepeshgarg007
e062acbbd3 fix: Removed shortcuts from desktop.py 2019-03-05 17:17:10 +05:30
Himanshu Warekar
acb7238ad6 Allow zero amount in additional salary 2019-03-05 12:20:19 +05:30
Rushabh Mehta
1f0792d5ea
Merge pull request #16823 from jay-parikh/sales-return 
fix: Python 3 Sales Invoice Return Validation "validate_pos"
 2019-03-05 08:05:00 +05:30
rohitwaghchaure
55c382a780
Merge pull request #16820 from rohitwaghchaure/state_code_blank_if_not_matched_with_state_codes 
fix: on save of the address, state code field become blank
 2019-03-04 16:59:45 +05:30
rohitwaghchaure
f6a8b17717
Merge pull request #16824 from rohitwaghchaure/user_not_able_to_search_item_by_description 
fix(sales order item): not able to search item by description
 2019-03-04 16:59:19 +05:30
rohitwaghchaure
369d20ac2b
Merge pull request #16829 from rohitwaghchaure/gst_purchase_invoice_hsn_number 
fix: HSN code not disaplying for the GST Purchase Invoice print format
 2019-03-04 16:58:58 +05:30
rohitwaghchaure
e552170ce6
Merge pull request #16704 from Anurag810/vedmata-print-formats 
feat: Auditors print formats
 2019-03-04 16:58:31 +05:30
rohitwaghchaure
8c96e06e19
Merge pull request #16629 from Anurag810/gross-and-net-profit-report 
feat: Gross and Net Profit Report
 2019-03-04 16:57:21 +05:30
Anurag Mishra
0c9945e0bf Minor fixes 2019-03-04 16:14:53 +05:30
Anurag Mishra
02138b6bfc fix: gross depends upon now report type 2019-03-04 14:46:28 +05:30
Prateeksha Singh
a5f2962c16
Merge pull request #16830 from pratu16x7/explore-2.0 
minor(modules): add onboard keys, remove hidden
 2019-03-04 14:39:29 +05:30
Aditya Hase
711ac5ae24
Merge pull request #16826 from deepeshgarg007/test_fix 
fix: Account type fix in test_united_states
 2019-03-04 14:21:54 +05:30
Prateeksha Singh
8aa4594b1e feat(modules): add onboard keys, remove hidden 2019-03-04 14:00:26 +05:30
Rohit Waghchaure
9842ce5a79 fix: HSN code not disaplying for the GST Purchase Invoice print format 2019-03-04 13:39:52 +05:30
deepeshgarg007
511713e131 fix: Delete GL entry for supplier before creating new one 2019-03-04 13:25:39 +05:30
deepeshgarg007
e615051ccc fix: Updated test_united_states 2019-03-04 13:22:51 +05:30
Deepesh Garg
44ff41188d fix: Selling and buying amount precision fix (#16764) 2019-03-04 12:56:27 +05:30
Deepesh Garg
40743840b7 fix: Print letter head only if checked in Print Settings (#16789) 
Letter head is printed in financial statements even if option is not checked

![letter head option](https://user-images.githubusercontent.com/42651287/53430759-26baa080-3a15-11e9-948a-bc95700a18d2.png)
 2019-03-04 12:53:11 +05:30
Deepesh Garg
e1f72cc010 revert: Address and contact report fix (#16786) 
Reverts #16674 

Address and other info are not visible in address and contact report
![screenshot 2019-02-27 at 11 31 38 am](https://user-images.githubusercontent.com/42651287/53469309-6029f500-3a83-11e9-9672-e5e7d14dc470.png)
 2019-03-04 12:49:39 +05:30
Anurag Mishra
1e4e61bd94 Minor fixes 2019-03-04 12:36:51 +05:30
Anurag Mishra
f3bdeedc68 minor fixes 2019-03-04 12:27:41 +05:30
deepeshgarg007
f6d1f53aef fix: Account type fix in test_united_states 2019-03-04 10:23:35 +05:30
Rohit Waghchaure
2bfb063fdb fix(sales order item): not able to search item by description 2019-03-02 21:47:55 +05:30
Jay Parikh
c2090939d7 Fix Sales Invoice Return Validation "validate_pos" 2019-03-02 12:19:32 +00:00
Rohit Waghchaure
4ef924d0ba fix: on save state code field become blank 2019-03-01 18:11:43 +05:30
Frappe Bot
8f0660ab31 Merge branch 'master' into develop 2019-03-01 09:22:36 +00:00
Frappe Bot
9ce994a320 Merge branch 'hotfix' 2019-03-01 09:12:25 +00:00
Frappe Bot
3ec0bb7e53 bumped to version 11.1.13 2019-03-01 09:12:25 +00:00
rohitwaghchaure
066da6b1b6
Merge pull request #16817 from gaurav-naik/italy-einvoice-bank-details-fix 
fix(regional,italy): bank details, custom button on sales invoice
 2019-03-01 14:26:07 +05:30
rohitwaghchaure
5e71a56c7a
Merge pull request #16807 from rohitwaghchaure/remove_validation_for_group_by_voucher_consolidate 
fix: when General Ledger is opened from Purchase Receipt or Delivery note, user get Opening and Closing printed twice
 2019-03-01 14:25:00 +05:30