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

28579 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Himanshu
e3ef56804c fix(Issue): track split from in issue (#18994) 
* fix: track split from in issue

* fix: rename field name

* fix: remove first_mins to response
 2019-09-11 19:20:20 +05:30
Fisher Yu
cd38ba4833 fix: several bugs and improvement ideas for education module #18599 (#18600) 
* Update student_report_generation_tool.py

bug fix

* Update student_applicant.json

* Update program_course.json

* Update course_activity.json
 2019-09-11 19:10:39 +05:30
Nabin Hait
1d1858a8b0
Show draft future payments as well 2019-09-11 18:39:49 +05:30
Nabin Hait
ff09b412f4
feat: Allowed multiple payment requests against a reference document (#18988) 2019-09-11 12:43:27 +05:30
Mangesh-Khairnar
7bcb24efbf fix(purchase-invoice): Update paid amount on creation of debit note (#18830) 
* fix(purchase-invoice): set paid amount for purchase return

* fix(purchase-invoice): remove payment schedule on creation of debit note
 2019-09-11 10:49:33 +05:30
rohitwaghchaure
bb736248a2 fix: incorrect qty calculation in the production plan fopr the sub assembely work orders (#18970) 2019-09-11 10:20:49 +05:30
Saurabh
e919388ee6 fix: do not cache value while creating item group, in setup wizard it will raise link validation error (#18992) 2019-09-11 10:07:50 +05:30
rohitwaghchaure
358a01a226 fix: Quotation Trends report not working for filter group by customer (#18989) 2019-09-10 19:18:30 +05:30
Nabin Hait
a035428d43 fix: handling of key does not exists error 2019-09-10 14:51:02 +05:30
Sahil Khan
d2315e5c5c Merge branch 'develop' into version-12 2019-09-10 14:38:39 +05:30
Sahil Khan
a2fd1f22da bumped to version 12.1.2 2019-09-10 14:58:39 +05:50
Sammish Thundiyil
bcda12f4bb modified: erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json (#18829) 2019-09-10 14:11:02 +05:30
Shivam Mishra
e851346b4c fix: dont make dashboards if company is not set (#18975) 
* fix: dont make dashboardss if company is not set

* fix: function call

* Update dashboard_charts.py
 2019-09-10 14:08:31 +05:30
Nabin Hait
88e8688a4b
fix: set raw material's batch based on main item's batch only if RM has batch no (#18977) 2019-09-10 14:07:45 +05:30
Suraj Shetty
0254217314 fix: Make address fields mandatory (#18979) 2019-09-10 14:07:05 +05:30
Mangesh-Khairnar
1853a83453 fix(packing-slip): add a descriptive message (#18981) 2019-09-10 13:21:01 +05:30
rohitwaghchaure
d312d11062 fix: port from hotfix (#18974) 
* fix: '>' not supported between instances of 'int' and 'str'

* fix: not able to save item because price list has disabled
 2019-09-10 10:47:36 +05:30
Deepesh Garg
69aeff15ef
Merge pull request #18971 from Anurag810/sales_invoice_print_format_fixes_v13 
fix: sales invoice return print format overriding the meta default print format
 2019-09-09 18:35:05 +05:30
Anurag Mishra
89d3bc0b54 fix: sales invoice return print format overideing the meta default print format 2019-09-09 15:58:25 +05:30
Mangesh-Khairnar
cbcede79b1
Merge pull request #18964 from nabinhait/max_carry_forwarded_leaves 
feat: Added input field for max carry forwarded leaves
 2019-09-09 14:38:06 +05:30
Faris Ansari
32eccb8fb2 fix: Rename duplicate label Image to Website Image (#18912) 2019-09-09 14:29:01 +05:30
Nabin Hait
632fc6af79 feat: Added input field for max carry forwarded leaves 2019-09-09 13:33:00 +05:30
Suraj Shetty
f43825e4dd fix: convert dict to list for iteration (#18963) 2019-09-09 13:23:01 +05:30
Shivam Mishra
5f59c2ae75 fix: reload account timeline before creating dashboards (#18934) 
* fix: sync account balance timeline.json before running patch

* fix: reload account timeline before creating dashboards
 2019-09-09 13:20:53 +05:30
Mangesh-Khairnar
fd312be79f
Merge pull request #18958 from surajshetty3416/employee-leave-balance-summary 
feat: Employee Leave Balance Summary report
 2019-09-09 13:18:41 +05:30
Nabin Hait
fb7c7b53ba feat: Added input field for max carry forwarded leaves 2019-09-09 12:08:58 +05:30
Suraj Shetty
d2f22b52a5
Merge branch 'develop' into employee-leave-balance-summary 2019-09-09 10:21:06 +05:30
MorezMartin
ffc4f8f2a5 feat: [stock -> packed_items] Enable modification of Description on packed items (#18907) 
* Change packed item

* Remove description field on update_packed_items

* add possibility to modify description on packed items
 2019-09-09 10:16:23 +05:30
rohitwaghchaure
cdcff6c26d Multiple port from v11 hotfix (#18954) 
* fix: circular dependency during asset cancellation

* fix: ImponibileImporto for On Previous Row Total

* fix: PrezzoUnitario decimal issue
 2019-09-09 10:15:01 +05:30
Faris Ansari
e352fb754b
fix: Reload doctype in variants patch (#18962) 2019-09-08 21:25:33 +05:30
Suraj Shetty
5ae40a9500
fix: Use absolute import instead of relative import 
Co-Authored-By: Mangesh-Khairnar <mkhairnar10@gmail.com>
 2019-09-08 15:16:35 +05:30
Suraj Shetty
40dbb63042
Merge branch 'develop' into employee-leave-balance-summary 2019-09-08 14:15:47 +05:30
Faris Ansari
594918bd3a
fix: Include Item variant patch in patches.txt (#18961) 2019-09-08 13:13:05 +05:30
Deepesh Garg
5343631708
Merge pull request #18960 from deepeshgarg007/gstr-1-remove-customer 
fix: Minor fix in GSTR-1
 2019-09-08 09:52:38 +05:30
deepeshgarg007
366451fc62 fix: Minor fix in GSTR-1 2019-09-08 09:51:15 +05:30
Suraj Shetty
a14ee7f1fe Merge branch 'develop' of github.com:frappe/erpnext into employee-leave-balance-summary 2019-09-07 22:02:02 +05:30
Suraj Shetty
c5588a9b93 fix: Column value and data indentation 2019-09-07 21:26:43 +05:30
Suraj Shetty
21a4f82f69 fix: Re-arrange filters 2019-09-07 20:21:56 +05:30
Nabin Hait
3b366c30a8
feat: Added default Leave Approver in Employee (#18953) 2019-09-07 12:31:07 +05:30
Saurabh
8e67a3a8a8 fix: check if 'All Item Group' exists before settings it as parent_item_group (#18956) 
* fix: check if 'All Item Group' exists before settings it as parent_item_group

* feat: get cached value to avoid db call on each insert
 2019-09-07 12:29:29 +05:30
Nabin Hait
4726fc4893 fix: Deleted unwanted production order files 2019-09-06 15:45:17 +05:30
Shivam Mishra
c69cc13c85 fix: updated footer message (#18949) 2019-09-06 15:40:15 +05:30
Prssanna Desai
ddfbb07c3b fix: fix accounts balance timeline dashboard chart source (#18942) 
* fix: fix accounts balance timeline dashboard chart source

* fix: pass chart_name to get function instead of chart object
 2019-09-06 15:38:06 +05:30
Nabin Hait
d30f87bbdf Merge branch 'Mangesh-Khairnar-feat-customer-credit-limit' into develop 2019-09-06 14:39:59 +05:30
Nabin Hait
4ce38059ac feat: Company wise credit limit 2019-09-06 14:33:10 +05:30
Anurag Mishra
bbc1b5cdcf feat: added date filter based on billing date and based date (#18935) 2019-09-06 12:10:37 +05:30
Anurag Mishra
ac0c1edd23 feat: added date filter based on billing date and based date (#18936) 2019-09-06 12:10:10 +05:30
Marica
a93b665427 fix: Print Format 'Point of Sale' removed from Sales invoice Print Format List (#18937) 
'Point of Sale' Print Format for offline POS ,now doesn't appear in the Print Format Labels List in Sales Invoice for v12.
 2019-09-05 18:26:45 +05:30
Sahil Khan
ede7050afe Merge branch 'develop' into version-12 2019-09-05 17:30:44 +05:30
Sahil Khan
0906bc8430 bumped to version 12.1.1 2019-09-05 17:50:44 +05:50