deepeshgarg007
|
14ff6bfc32
|
fix: Decimal point issue in gross profit print
|
2019-02-21 12:08:32 +05:30 |
|
Nabin Hait
|
bace4d3e6d
|
Merge pull request #16358 from adityahase/naming-series
feat(naming): Deferred naming for SLE and GL Entry
|
2019-01-18 10:55:30 +05:30 |
|
Nabin Hait
|
28ccaa3c88
|
Merge branch 'staging-fixes' into Gross-Profit-Return-Fix
|
2019-01-16 17:49:22 +05:30 |
|
Saif Ur Rehman
|
fccb1e55ec
|
fix(Gross Profit Report): corrected fieldnames in return invoice query
|
2019-01-16 14:36:55 +05:00 |
|
Aditya Hase
|
0c16424d7d
|
fix(naming): Use creation instead of name to order SLEs
|
2019-01-08 00:09:36 +05:30 |
|
Saif Ur Rehman
|
016f29f09b
|
fix: error due to passing None in scrub
|
2019-01-02 16:22:22 +05:00 |
|
Saif Ur Rehman
|
e194a655df
|
fix: is_opening != 'Yes'
|
2019-01-02 16:09:34 +05:00 |
|
Saif Ur Rehman
|
fac6b59627
|
Exclude opening invoices in Gross Profit Report
|
2019-01-01 16:33:22 +05:00 |
|
Saif Ur Rehman
|
23eef11cf5
|
Fixed get_buying_amount in Gross Profit report:
To handle the case where there may be multiple invoices for a single delivery
|
2018-11-21 15:32:37 +05:00 |
|
Rushabh Mehta
|
708e47aadf
|
optimize(various)
|
2018-08-08 16:37:31 +05:30 |
|
Saurabh
|
d7897f1c53
|
Resolved merge conflicts
|
2018-07-18 17:08:16 +05:30 |
|
rohitwaghchaure
|
a3e070bc6b
|
[Fix] Invoices not showing in the gross profit report against which sales return entry has created (#14914)
|
2018-07-16 18:11:19 +05:30 |
|
Achilles Rasquinha
|
efb731941d
|
ran 2to3, evaluation (#13499)
* ran 2to3, evaluation
* Update update_gstin.py
* Update accounts_receivable_summary.py
|
2018-05-23 11:31:24 +05:30 |
|
matmyers
|
742da8cfce
|
removed duplicate keys (#13675)
|
2018-04-17 12:20:57 +05:30 |
|
rohitwaghchaure
|
60febc5465
|
[Fix] Gross profit validation issue (#12516)
|
2018-01-17 14:40:59 +05:30 |
|
rohitwaghchaure
|
02302ff009
|
[Fix] Incoming rate for gross profit report (#12422)
|
2018-01-11 12:58:46 +05:30 |
|
Makarand Bauskar
|
80f333950b
|
[minor] fixed AttributeError: 'GrossProfitGenerator' object has no attribute 'grouped_data' (#11195)
|
2017-10-16 11:27:22 +05:30 |
|
Nabin Hait
|
cf36534eed
|
Gross profit report considering returned items (#10734)
|
2017-09-18 19:13:45 +05:30 |
|
rohitwaghchaure
|
059f99e621
|
[Fix] Wrong avg. buying rate in the Gross Profit report (#10110)
|
2017-07-27 11:37:30 +05:30 |
|
tunde
|
67cbeb1bb0
|
Merge branch 'develop' into issue-9096
|
2017-06-26 12:11:07 +01:00 |
|
tunde
|
96e629a635
|
adds credits notes to report since double entry for P or L affects sales
|
2017-06-22 10:04:33 +01:00 |
|
Rohit Waghchaure
|
a5f40941ae
|
[Enhance] Companywise perpetual inventory setting
|
2017-06-20 10:21:33 +05:30 |
|
Nabin Hait
|
731efe3a95
|
Minor fix in gross profit report
|
2017-04-03 12:11:36 +05:30 |
|
Nabin Hait
|
2c892c7e7f
|
Indentation fixed in gross profit report
|
2017-04-03 12:05:35 +05:30 |
|
Nabin Hait
|
b15d999147
|
Merge branch 'develop' into gross_profit_issue_v_8
|
2017-03-31 17:39:45 +05:30 |
|
Rushabh Mehta
|
cc8b2b2fdb
|
[fix] [refactor] demo for v8 and remove purchase common
|
2017-03-31 17:36:48 +05:30 |
|
Rohit Waghchaure
|
34b1dba9aa
|
[fix] get_valuation_rate takes 4 arguments 3 given in gross profit report
|
2017-03-31 12:44:10 +05:30 |
|
Nabin Hait
|
1f6bd0ad37
|
Fixed merge conflict
|
2017-03-30 13:15:22 +05:30 |
|
Nabin Hait
|
77c970549b
|
In gross profit report, if incoming rate not found from last sle, consider average valuation rate
|
2017-03-28 12:20:31 +05:30 |
|
Rohit Waghchaure
|
faedf8274c
|
[fix] gross profit permission issue
|
2017-03-14 14:56:24 +05:30 |
|
Nabin Hait
|
1ed8bc4c36
|
Gross Profit report: Consider Sales team table only if grouped by sales person
|
2017-03-12 17:10:41 +05:30 |
|
Nabin Hait
|
b3ffd6b282
|
Merge pull request #7828 from rohitwaghchaure/update_user_roles_to_roles
Changed userrole to has role, commonify role editor of the user
|
2017-03-06 18:44:53 +05:30 |
|
Nabin Hait
|
e68f32cf19
|
UOM Conversion in selling
|
2017-03-06 16:41:13 +05:30 |
|
Rohit Waghchaure
|
e7485150a1
|
added roles in the report
|
2017-03-06 14:26:09 +05:30 |
|
Rohit Waghchaure
|
38f808cfae
|
[Fix] Buying rate in gross profit report
|
2017-02-01 13:34:06 +05:30 |
|
Kanchan Chauhan
|
025fbd8f14
|
Customer group added to Gross Profit report
|
2016-10-20 12:54:06 +05:30 |
|
Pawan Mehta
|
bee3b40725
|
Update gross_profit.py
|
2016-08-22 17:47:13 +05:30 |
|
pawan
|
18bb431baa
|
[fix] #6089
|
2016-08-22 17:27:22 +05:30 |
|
pawan
|
851e05672c
|
[fix] #6089
|
2016-08-22 14:25:17 +05:30 |
|
Neil Trini Lasrado
|
efccb8a704
|
Fixed error in Gross Profit report
|
2016-05-27 13:24:02 +05:30 |
|
Nabin Hait
|
f509d13d28
|
[fix] Get average selling rate based on group by
|
2016-04-12 17:01:39 +05:30 |
|
Neil Trini Lasrado
|
6e343e23d9
|
Renamed project_name to project
|
2016-03-15 17:50:53 +05:30 |
|
shreyas
|
7c42995949
|
[Minor] Remove Warehouse column while user groups by 'Item code' in Gross profit report
|
2016-03-09 13:15:38 +05:30 |
|
ShashaQin
|
bcc56a4557
|
Update gross_profit.py
Gross Profit report improvement
|
2016-02-04 11:45:00 +08:00 |
|
Nabin Hait
|
6d8688f8b4
|
[fix] Currency in Gross Profit report
|
2016-01-19 17:27:06 +05:30 |
|
Nabin Hait
|
b6b56453e1
|
[fix] Get defaults based on doctype or fieldname
|
2015-12-23 16:37:06 +05:30 |
|
Anand Doshi
|
602e8253be
|
[enhancement] Int, Currency, Float, Percent as not null and default to 0
|
2015-11-19 13:23:36 +05:30 |
|
Anand Doshi
|
c5c6c0669f
|
[fix] gross profit
|
2015-11-12 11:07:32 +05:30 |
|
Nabin Hait
|
c3ced9a0b5
|
[fix][report] Buying amount for product bundle in Gross Profit report
|
2015-11-05 13:13:31 +05:30 |
|
Nabin Hait
|
83dd3e14e5
|
[fix] Gross Profit report should not include return entries
|
2015-09-09 10:37:04 +05:30 |
|
Nabin Hait
|
1901ca5a45
|
[fix] Fixed gross profit report due to removal of designation field from Sales Team table
|
2015-08-31 12:02:50 +05:30 |
|
Rushabh Mehta
|
1e8025b327
|
[cleanup] yes/no selects changed to checks in Item
|
2015-07-29 11:38:33 +05:30 |
|
Nabin Hait
|
f666535223
|
[fix] gross profit report
|
2015-07-23 17:08:44 +05:30 |
|
Neil Trini Lasrado
|
ed8cecbdd8
|
Sales BOM renamed to Product Bundle
|
2015-07-13 12:41:27 +05:30 |
|
Nabin Hait
|
885c70984d
|
[fix] Always show Sales invoice in Gross profit report
|
2015-07-02 14:09:49 +05:30 |
|
Nabin Hait
|
0b18a2d347
|
Reset values in tools like Payment Tool
|
2015-06-05 12:01:29 +05:30 |
|
Nabin Hait
|
8908543a9c
|
In standard print format, item name will now honour 'Print Hide' property
|
2015-06-01 14:01:56 +05:30 |
|
Nabin Hait
|
6ee8c545e3
|
[fix] gross profit report
|
2015-05-29 10:39:09 +05:30 |
|
Nabin Hait
|
f61f76ba45
|
[fix] gross profit report
|
2015-05-25 14:13:03 +05:30 |
|
Nabin Hait
|
0a705fe582
|
gross profit report fix
|
2015-05-19 11:12:06 +05:30 |
|
Anand Doshi
|
e6ac87e86f
|
Gross Profit Report: Company filter should be reqd
|
2015-04-30 15:33:31 -07:00 |
|
Rushabh Mehta
|
20bcf6aeff
|
[fixes] print_hide on stock uom and gross profit
|
2015-04-13 15:31:24 +05:30 |
|
Anand Doshi
|
885e074697
|
Changed company name from Web Notes to Frappe Technologies
|
2015-03-03 14:56:43 +05:30 |
|
Nabin Hait
|
82e3e25cdb
|
fixes for base_rate, base_amount, tax_amount: mass search and replace
|
2015-02-24 10:02:28 +05:30 |
|
ankitjavalkarwork
|
35db282765
|
Fix gross_profit.py, commonify and add elementwise grouping to report
|
2014-12-04 13:08:42 +05:30 |
|
Rushabh Mehta
|
ec9db4b799
|
[report] gross profit WIP
|
2014-12-04 12:37:39 +05:30 |
|
Rushabh Mehta
|
969069fbf9
|
[report] gross profit WIP
|
2014-12-04 12:37:39 +05:30 |
|
ankitjavalkarwork
|
bd8a8b9bd7
|
[#2230] Add Totals row to Gross Profit report
|
2014-11-10 12:36:43 +05:30 |
|
Nabin Hait
|
c68646c694
|
[merge] 4.x to 5.0
|
2014-10-06 12:57:48 +05:30 |
|
ankitjavalkarwork
|
9aa11d2ad7
|
Add ability to fetch Non stock items in Gross Profit report
|
2014-09-18 19:08:04 +05:30 |
|
Nabin Hait
|
556fbc487d
|
Minor fix in gross profit report
|
2014-09-17 12:13:44 +05:30 |
|
81552433qqcom
|
951da0ca3d
|
added translations to report py file.
|
2014-09-12 16:07:12 +05:30 |
|
Anand Doshi
|
ec8240e890
|
Apply User Permissions optional in Script and Query Reports
|
2014-06-04 17:48:58 +05:30 |
|
Pratik Vyas
|
b52618c142
|
frappe._ to __
|
2014-04-14 16:25:30 +05:30 |
|
Rushabh Mehta
|
0a0f2495a2
|
frappe/frappe#478, frappe tests pass, .txt renamed to .json
|
2014-03-31 17:27:06 +05:30 |
|
Anand Doshi
|
40534f076b
|
Changed creation, modified format frappe/frappe#478
|
2014-03-28 12:46:53 +05:30 |
|
Rushabh Mehta
|
daae743608
|
frappe/frappe#478
|
2014-03-27 17:54:18 +05:30 |
|
Anand Doshi
|
09a9f4c0c9
|
Added module to Report doctype
|
2014-03-07 17:20:22 +05:30 |
|
Anand Doshi
|
e9baaa68e7
|
Changed frappe.conn to frappe.db
|
2014-02-26 12:35:33 +05:30 |
|
Rushabh Mehta
|
793ba6bd37
|
-webnotes +frappe 💥
|
2014-02-14 15:47:51 +05:30 |
|
Nabin Hait
|
1eb560130a
|
Rename fields: amount related fields
|
2014-02-12 14:54:14 +05:30 |
|
Nabin Hait
|
7979f7ed21
|
Field Rename: rate field mass replacement
|
2014-02-12 14:54:14 +05:30 |
|
Rushabh Mehta
|
1f84799f2d
|
install, web serving, session booting webnotes/wnframework#351
|
2013-12-12 19:12:19 +05:30 |
|
Rushabh Mehta
|
afea58b7a1
|
moved modules inside erpnext folder
|
2013-12-11 10:43:52 +05:30 |
|