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
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
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
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
ac0c1edd23
feat: added date filter based on billing date and based date ( #18936 )
2019-09-06 12:10:10 +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
Nabin Hait
ac2b5ed84f
fix: credit limit patch
2019-09-05 16:57:26 +05:30
Nabin Hait
b847731482
Merge branch 'feat-customer-credit-limit' of https://github.com/Mangesh-Khairnar/erpnext into Mangesh-Khairnar-feat-customer-credit-limit
2019-09-05 16:47:08 +05:30
Nabin Hait
b5bd91417d
fix: Print/PDF of AR/AP report after refactoring ( #18931 )
2019-09-05 16:43:20 +05:30
Himanshu
6298da4458
fix: treeview fixes ( #18803 )
2019-09-05 16:12:33 +05:30
Deepesh Garg
cffe577028
fix: Add UOM in anlytics report when viewing based on item ( #18902 )
2019-09-05 16:03:15 +05:30
Raffael Meyer
48d1463825
fix(CoA): SKR04 ( #18820 )
...
- move debitors into receivables
- move creditors into payables
- rename "C - Verb." to "C-Verbindlichkeiten" for consitency
- move "Erlösschmälerungen" into a root of type "Expense"
- move "Erhaltene Boni" and "Erhaltene Rabatte" into a root of type "Income"
2019-09-05 15:15:28 +05:30
hendrik
c257ce82c5
Party accounts if don't have default company ( #18771 )
...
Add check for get_default company
2019-09-05 15:14:09 +05:30
Anurag Mishra
867ac10ffd
fix: handle for product bundle ( #18420 )
...
* fix: handle for product bundle
* fix: Requested changes and some general fixes
2019-09-05 15:13:21 +05:30
KanchanChauhan
d114c8f88f
fix(Purchase Order): Status updater ( #18612 )
2019-09-05 15:11:43 +05:30
Karthikeyan S
1d1427de60
fix(auto attendance): handling None case for IN/OUT Logs ( #18867 )
2019-09-05 15:02:33 +05:30
Andy Zhu
91596f2467
Change the field name for Payment Entry ( #18874 )
...
In the Payment Entry Form, the field name for customer name is 'party' instead of 'party_name'.
Need to change the customer_dashboard file accordingly.
2019-09-05 15:01:38 +05:30
John Clarke
a7d448dcba
fix: Error "TypeError: unorderable types: int() > str()" When Trying to Create Packing Slip ( #18913 )
...
User report here https://discuss.erpnext.com/t/error-typeerror-unorderable-types-int-str-when-trying-to-create-packing-slip/52445
This has not been noted to github issues and is just a suggested fix, an expert may need to refactor more here?
User and traceback does not state whether Python 2 or 3 but perhaps 3 since that apparently does not 'guess' when types do not match?
See also https://stackoverflow.com/questions/14886881/unorderable-types-int-str
2019-09-05 14:55:35 +05:30
Rohan
77da3b4347
fix: pull project from task ( #18776 )
2019-09-05 14:53:43 +05:30
Rohan
9d77e9f719
fix: error while trying to get directions ( #18827 )
2019-09-05 14:51:22 +05:30
Govind S Menokee
c901d6322c
fix(18837): Student creation error ( #18838 )
...
Academic user not able to create student
2019-09-05 14:50:23 +05:30
rohitwaghchaure
7496548c39
fix: not able to create invoice against patient ( #18858 )
2019-09-05 14:48:51 +05:30
rohitwaghchaure
f1fab871b8
fix: mismatch between warehouse tree value and warehouse based stock balance report value ( #18879 )
2019-09-05 14:47:43 +05:30