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

25572 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rushabh Mehta
349a1157ef
Merge pull request #16717 from jigartarpara/fix_payment_term_template 
fix: Add credit month in validation
 2019-03-15 09:03:54 +05:30
Rushabh Mehta
b7abdf1222
Merge pull request #16851 from JoyceBabu/develop 
fix: Add 'Half-Yearly' option to Earned Leave Frequency
 2019-03-15 09:02:43 +05:30
Rushabh Mehta
957a3307ae
Merge pull request #16634 from Alchez/hotfix-stock-balance-balance 
fix(stock_balance): Make balance qty and value columns more visible in the Stock Balance report
 2019-03-15 09:02:20 +05:30
Rushabh Mehta
e5d79f3621
Merge pull request #16673 from Alchez/feat-task-from-issue 
feat(issue): Create and view Tasks from Issues
 2019-03-15 08:55:20 +05:30
Rushabh Mehta
2352ce92cc
Merge pull request #16849 from frappe/bcornwellmott-patch-1 
fix: Add date to currency exchange caching
 2019-03-14 14:18:09 +05:30
Rushabh Mehta
bd9622bfd5
Merge pull request #16918 from Alchez/hotfix-party-payments 
fix(transaction): Add link to payments made by Customer / Supplier in their dashboards
 2019-03-14 14:14:42 +05:30
Rohan Bansal
82433845e5 fix(transaction): Add link to payments made by Customer / Supplier in their dashboards 2019-03-14 13:18:55 +05:30
Rushabh Mehta
f49d0d8058
Merge pull request #16890 from Anurag810/timesheet 
feat: Timesheet Reports
 2019-03-14 10:31:23 +05:30
Rushabh Mehta
6e2286f5f0
Merge pull request #16897 from PawanMeh/fixes_16894 
fixes: Amazon v12 integration issues
 2019-03-14 10:30:29 +05:30
Anurag Mishra
641e412853 fix: Removed raw query and used frappe.get_all 2019-03-12 13:12:31 +05:30
Rohan Bansal
f4bce6a66e fix(issue): Replace Make buttons on Issue and Task with a dashboard 2019-03-12 12:48:13 +05:30
Rohan Bansal
bf7c69f3c4 fix(issue): Don't auto-set project 2019-03-12 12:48:13 +05:30
Rohan Bansal
fa77b591ac fix(issue): View Tasks against an Issue 2019-03-12 12:48:13 +05:30
Rohan Bansal
2ba21fb66c fix(issue): Add issue name in Task and fix description in Issue 2019-03-12 12:48:13 +05:30
Rohan Bansal
5327d0253d feat(issue): Create tasks from issues 2019-03-12 12:40:32 +05:30
Anurag Mishra
9a1adc7c49 Added mandatory feilds to the report 2019-03-12 11:00:02 +05:30
Faris Ansari
2221151132
fix: Update Training Level 2019-03-12 10:55:11 +05:30
Anurag Mishra
34e1f92a7e fix: readability 2019-03-11 18:17:22 +05:30
Anurag Mishra
1218255178 feat: Project Billing Summary for timesheet 2019-03-11 17:43:44 +05:30
pawan
c0e1000919 fix: SKU issue 2019-03-11 14:58:17 +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
pawan
7c3e017ac3 fix: Amazon integration issues 2019-03-11 14:47:57 +05:30
Rohit Waghchaure
267723f57b fix: stock ledgre report not working 2019-03-11 14:06:00 +05:30
Anurag Mishra
9b64baa734
Minor Fixes 2019-03-11 12:02:25 +05:30
Anurag Mishra
59f4556d95 Commonify code 2019-03-11 11:58:34 +05:30
Anurag Mishra
e86ac3c8d4 feat: timesheet Employee Summary Report 2019-03-11 11:58:28 +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
Rohan Bansal
e66f59654e fix(report): Incorrectdata for balance quantity and value in Stock Balance report 2019-03-06 16:04:11 +05:30
Rushabh Mehta
29c46bb311 fix(sales_order.py): handle zero bundle qty 2019-03-06 14:49:13 +05:30
Joyce Babu
3d0121369f Add 'Half-Yearly' option to Earned Leave Frequency 
in addition to the current values of Monthly, Quarterly and Yearly
 2019-03-06 13:04:45 +05:30
bcornwellmott
b263876918
Add date to currency exchange caching 
The current currency exchange caching does not keep track of the transaction date, so if you are backdating transactions, the system probably isn't pulling the correct exchange rate (if it's looking up the currency exchange rate on the fly)
 2019-03-05 16:44:02 -08:00
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