Nabin Hait
9771b9376d
Merge branch 'master' into develop
2017-12-15 12:53:56 +05:30
Pawan Mehta
d6cb617520
Fix 11948 - Sales Payment Summary ( #11950 )
...
* [fix] #11948
* [fix] #11948
* [fix] #11948
* codacy issues
2017-12-14 18:04:31 +05:30
rohitwaghchaure
5759258dcf
[fix] Added total closing in general ledger ( #11961 )
2017-12-13 18:57:37 +05:30
pawan
1892454036
Add Total Row
2017-12-11 17:48:56 +05:30
Nabin Hait
5de499e5d5
Minor cleanups
2017-12-07 12:01:06 +05:30
pawan
271b7cd4f9
codacy issues
2017-12-07 12:01:00 +05:30
pawan
19f09b0b69
fix codacy issues
2017-12-07 12:00:06 +05:30
pawan
d8e91982ca
Fixed Merge conflict
2017-12-07 12:00:01 +05:30
Nabin Hait
c84476bd27
Fixed merge conflict
2017-12-06 14:17:51 +05:30
rohitwaghchaure
d52c64ff11
[fix] Show total for opening and closing dr/cr ( #11860 )
2017-12-06 13:14:28 +05:30
rohitwaghchaure
3a5ca927e7
[Fix] Asset depreciations and balances report showing wrong accumulated depreciation amount if multiple asset against same asset category ( #11848 )
...
* [Fix] Asset depreciations and balances report showing wrong accumulated depreciation amount if multiple asset against same asset category
* Update asset_depreciations_and_balances.py
2017-12-04 19:29:03 +05:30
Saurabh
34a0e90115
[fix] merge conflicts
2017-11-30 16:45:01 +05:30
Faris Ansari
ec3be9eebf
[hotfix] Party Type name ( #11797 )
2017-11-30 15:53:39 +05:30
Saurabh
ed4191ec5b
[fix] merge-conflicts
2017-11-22 18:01:56 +05:30
rohitwaghchaure
179e0c1d8d
Added party name in accounts receivable/payable report ( #11656 )
2017-11-20 11:18:55 +05:30
Nabin Hait
1c4653ed97
Merge branch 'develop' into payment-terms
2017-11-17 12:41:56 +05:30
Manas Solanki
eb3982044b
convert html into text in the taxes description as it can break the reports ( #11603 )
2017-11-16 14:11:39 +05:30
Pawan Mehta
bda07c6db4
Added Warehouse, Cost Center, Owner filters to Sales Register ( #11600 )
...
* [fix] #3668
* fix codacy space issue
2017-11-16 14:09:17 +05:30
Rushabh Mehta
d3f5d0961a
[feature] Opening Invoice Creation Tool ( #11589 )
...
* [enhance] Opening Invoice Tool create Opening Sales/Purchase Invoices
* [minor] added progress bar while creating invoice
* [minor] allow bulk upload for the invoices
* [minor] calculate item rate from net total
* [minor] added defaults for invoices fields, create gl entries only if grand_total is greater than 0
* [minor] check mandatory values before making opening invoices
* [minor] enable primary button if there is any error while creating invoices
* [minor] minor fixes, set company currency as invoice currency added tests
* [dashboard] added Opening Invoice Summery section in Dashboard
* [minor] added total invoices count on dashboard
* [minor] don't show dashboard if there are no opening invoices available
* [minor] added Opening Invoice Tools to Account's Tools section
* [minor] codecy fixes
* [fix] refactored general ledger and buttons on charts
* [fix] tests
2017-11-15 16:29:53 +05:30
tunde
ffa659fd2c
Merge branch 'develop' into payment-terms
2017-11-14 09:59:45 +01:00
Nabin Hait
15753074bf
Nestedset model fixes for changing parent and renaming ( #11467 )
2017-11-10 11:12:43 +05:30
Nabin Hait
e552a51266
Minor cleanups
2017-11-06 17:39:31 +05:30
pawan
436f7b980c
codacy issues
2017-11-06 17:39:31 +05:30
pawan
438dfc081b
fix codacy issues
2017-11-06 17:39:30 +05:30
pawan
d59225635d
remove old report
2017-11-06 17:39:30 +05:30
pawan
b699b86b76
Add Total Row
2017-11-06 17:39:30 +05:30
pawan
8d1d64aa29
[fix] #11449
2017-11-06 17:39:30 +05:30
pawan
e61a275651
[fix] #11427
2017-11-06 17:39:30 +05:30
Prateeksha Singh
6b26e391b8
use the new frappe charts :D ( #11391 )
2017-10-31 12:58:48 +05:30
tunde
09ce68ec19
Merge branch 'develop' into payment-terms
2017-10-19 17:47:31 +01:00
Saurabh
5fa2adcca9
Merge branch 'master' into develop
2017-10-18 16:23:44 +05:30
Prateeksha Singh
bfb108d722
Replace c3 ( #11112 )
...
* [charts] replace in asset.js
* replace in reports
2017-10-17 12:03:02 +05:30
Makarand Bauskar
80f333950b
[minor] fixed AttributeError: 'GrossProfitGenerator' object has no attribute 'grouped_data' ( #11195 )
2017-10-16 11:27:22 +05:30
tunde
3387d026b1
Merge branch 'develop' into payment-terms
2017-09-19 18:07:12 +01:00
Nabin Hait
bd4b80e3d8
Merge branch 'master' into develop
2017-09-19 12:05:41 +05:30
Nabin Hait
cf36534eed
Gross profit report considering returned items ( #10734 )
2017-09-18 19:13:45 +05:30
Saurabh
3f15bf9828
[fix] query fix for match conditions ( #10810 )
2017-09-18 15:27:24 +05:30
tundebabzy
c050c6945c
show error message if cannot get accounts details ( #10768 )
2017-09-13 15:27:30 +05:30
tunde
1255aa0f11
Merge branch 'develop' into payment-terms
2017-09-12 11:54:52 +01:00
Sagar Vora
d54d6bc572
[fix] use stock_qty in reports instead of qty to match with stock_uom ( #10727 )
2017-09-12 11:31:10 +05:30
Nabin Hait
f5cbb9c7b9
[fix] Actual amount for budget variance report
2017-09-11 13:58:15 +05:30
tunde
a19ea6e2f3
Merge branch 'develop' of https://github.com/frappe/erpnext into payment-terms
2017-08-29 15:26:50 +01:00
mbauskar
aaec42ebc2
resolved merged conflicts
2017-08-28 11:57:56 +05:30
Nabin Hait
bf4a974124
IMproved print format for AR/AP report ( #10528 )
2017-08-25 12:10:49 +05:30
Nabin Hait
caab582943
Tax breakup for actual amount and fixes in itemised purchase register ( #10515 )
...
* Tax breakup for actual amount and fixes in itemised pur register
* Rounding of itemised tax breakup amount
2017-08-24 16:22:28 +05:30
mbauskar
06f5ae0e78
Merge branch 'master' into develop
2017-08-23 13:06:43 +05:30
Saurabh
b903c86076
Merge pull request #10506 from nabinhait/hotfix677
...
Minor fix in itemised sales register
2017-08-23 11:13:31 +05:30
Nabin Hait
fcb2462902
Minor fix in itemised sales register
2017-08-23 09:44:33 +05:30
Nabin Hait
382f5eb1b1
Run sales/purchase register for one month by default ( #10493 )
2017-08-22 19:06:21 +05:30
tunde
d13fe18d30
Merge branch 'develop' into payment-terms
2017-08-22 14:18:11 +01:00
