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

7958 Commits

Author SHA1 Message Date
rohitwaghchaure
d8683d381b
Merge pull request #22205 from deepeshgarg007/fiscal_year_travis 
fix: Travis(develop)
 2020-06-15 16:12:10 +05:30
Deepesh Garg
0d880079b1 fix: Validation for group cost center 2020-06-15 12:23:24 +05:30
Deepesh Garg
817cbc4b48 fix: Minor fixes in cost center 2020-06-15 12:07:04 +05:30
rohitwaghchaure
25f49d59c5
Merge pull request #22233 from deepeshgarg007/pi_billing_address 
fix: Billing address in for Purchase documents
 2020-06-14 15:10:43 +05:30
Rohit Waghchaure
d6f9a51cbb fix: item none not found while making sales invoice using opening invoice creation tool 2020-06-14 14:46:49 +05:30
Deepesh Garg
6760077674 fix: Billing address in for Purchase documents 2020-06-13 22:40:23 +05:30
Deepesh Garg
5f4330621c
Merge pull request #22231 from deepeshgarg007/financila_satement_immutable 
fix: Handle cancelled entries in financial statements
 2020-06-13 21:19:20 +05:30
Deepesh Garg
cc4943d54d fix: Distributed cost center query updation 2020-06-13 21:13:52 +05:30
Deepesh Garg
d80d442aa1 fix: Do not select cancelled entries in financial statements 2020-06-13 21:12:19 +05:30
Deepesh Garg
f3261794d9
Merge pull request #22230 from deepeshgarg007/financial_statement_to_date_v13 
fix: Data not appearing properly for some fiscal_year in financial statements
 2020-06-13 19:27:38 +05:30
Deepesh Garg
15231aa60d fix: Data not appearing properly for some fiscal_year in financial statemets 2020-06-13 19:26:39 +05:30
Deepesh Garg
c258ac82c5 feat: Accounting entries for service item in Purchase receipt 2020-06-12 18:33:42 +05:30
Deepesh Garg
7e974c9e2c fix: Test Cases 2020-06-12 15:29:40 +05:30
Deepesh Garg
ca97e19b7e
Merge pull request #22203 from marination/account-tree 
fix: Check for Company before rendering tree in Account Tree
 2020-06-12 10:02:41 +05:30
Deepesh Garg
9df4532d14 fix: Travis(develop) 2020-06-11 21:33:43 +05:30
marination
c9a6e4f151 fix: Check for Company before rendering tree in Account Tree 2020-06-11 19:54:44 +05:30
Abhishek Balam
44b8cf4fef
enable 'user cannot create' for payment request (#22044) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-11 19:31:41 +05:30
Deepesh Garg
7d3c3b9a8b
Merge pull request #22188 from deepeshgarg007/payment_terms_outstanding 
fix: Update payment schedule based on payment terms
 2020-06-10 22:17:37 +05:30
Deepesh Garg
a0fd97f2ac fix: Update payment schedule based on payment terms 2020-06-10 22:15:27 +05:30
Deepesh Garg
f108574772
Merge pull request #22186 from deepeshgarg007/inter_warehouse_party_validation 
fix: Party validation for inter-warehouse transaction
 2020-06-10 20:02:43 +05:30
Deepesh Garg
7963e2b708 fix: Party validation for inter-warehouse transaction 2020-06-10 19:57:49 +05:30
Deepesh Garg
6e0d6bd74c
Merge pull request #22184 from deepeshgarg007/item-wise-report-export 
fix: Item-wise sales and purchase register export
 2020-06-10 18:48:35 +05:30
Deepesh Garg
08fee12266 fix: Item-wise sales and purchase register export 2020-06-10 18:33:24 +05:30
rohitwaghchaure
0233f94570
Merge pull request #22081 from deepeshgarg007/jv_list_view 
fix: Add total debit in Journal Entry list view
 2020-06-10 14:17:13 +05:30
Karthikeyan S
e9ff6d3d52
feat(Cost Center): Distributed Cost Center (#21531) 
* feat: Distributed Cost Center

Squashed commit of the following:

commit 274236eb92dfddfd015583ee1e6b5e1937366d28
Author: Vignesh <kaviya.3111999@gmail.com>
Date:   Mon Mar 23 18:32:26 2020 +0530

    Fix: Indentation

commit beae0b9849f333dd1d9f29c27192ea7de2e4e809
Author: Vignesh <kaviya.3111999@gmail.com>
Date:   Mon Mar 23 18:26:50 2020 +0530

    The validations are added to distributed cost center.

commit 3f66943adacb5797338ef3510251bf6633be3dba
Author: Vignesh <kaviya.3111999@gmail.com>
Date:   Thu Mar 19 22:17:25 2020 +0530

    The distributed cost centers are shown with the percentage allocation in the reports

commit 1ac11df522096fa187d2f5863b4c970e18b37fac
Author: Vignesh <kaviya.3111999@gmail.com>
Date:   Thu Mar 19 13:36:04 2020 +0530

    The child table distributed cost center are added to cost center doctype and then validate percentage allocation.

* fix(Distributed Cost Center): validation and filters

* fix(Distributed Cost Center): financial statement query

* fix(Distributed Cost Center): add test cases

Co-authored-by: Vignesh S <svignesh0308@gmail.com>

* fix(Distributed Cost Center): budget variance, general ledger, profitability analysis reports.

* Merge branch 'develop' into develop-distributed-cost-center

* fix(Distributed Cost Center): Added DCC reflection in actual amount column of Budget Variance Report.

* Update creation field in general ledger report

Co-authored-by: Nabin Hait <nabinhait@gmail.com>

* creation field updated in gl_entries query

Co-authored-by: Nabin Hait <nabinhait@gmail.com>

Co-authored-by: KaviyaPeriyasamy <kaviya.3111999@gmail.com>
Co-authored-by: Vignesh S <svignesh0308@gmail.com>
Co-authored-by: KaviyaPeriyasamy <kaviyaperiyasamy22@gmail.com>
Co-authored-by: Kaviya Periyasamy <36359901+KaviyaPeriyasamy@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-08 12:20:21 +05:30
rohitwaghchaure
b3b5c96749
Merge pull request #22092 from marination/shippinng-address 
fix: Apply shipping rule without address too
 2020-06-08 10:36:19 +05:30
Deepesh Garg
76ddf4f0b5
Merge pull request #22132 from deepeshgarg007/tds_monthly_cancelled_v13 
fix: Cancelled entries in tds payable monthly report
 2020-06-07 00:08:57 +05:30
Deepesh Garg
c01b4aa2e5
Merge pull request #22131 from deepeshgarg007/tds_monthly_cancelled 
fix: Cancelled entries in tds payable monthly report
 2020-06-07 00:08:17 +05:30
Deepesh Garg
cdd92d756d fix: Cancelled entries in tds payable monthly report 2020-06-07 00:03:28 +05:30
Deepesh Garg
57f9d43c43 fix: Cancelled entries in tds payable monthly report 2020-06-07 00:01:20 +05:30
Deepesh Garg
7135a75e5e fix: Error when no data is present in AR/AP reeport 2020-06-03 21:51:21 +05:30
marination
0c72249403 fix: Apply shipping rule without address too 2020-06-03 14:32:07 +05:30
Deepesh Garg
60f3a2b8e7 fix: Add total debit in Journal Entry list view 2020-06-02 18:26:43 +05:30
Deepesh Garg
3609ddedbb fix: Purchase receipt item json 2020-05-30 12:03:37 +05:30
Deepesh Garg
c96bf870e4 fix: Test Cases 2020-05-30 11:46:39 +05:30
Deepesh Garg
8a4dc521cd Revert 'fix: tests depending on global default company' 2020-05-30 11:40:16 +05:30
Deepesh Garg
36f7710356 Revert "fix: tests depending on global default company" 
This reverts commit 1f20c99ecfb51675d7182588001bb3c1d581f415.
 2020-05-30 11:38:04 +05:30
Deepesh Garg
f8550790fa This reverts commit aa196c0a667ee7c3f2400fc7bd65319ccbb25a5a 2020-05-30 11:37:36 +05:30
Deepesh Garg
52baf8f863 fix: Test Cases 2020-05-29 17:20:03 +05:30
Deepesh Garg
c897e800ed Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-05-29 11:04:20 +05:30
Saqib
3c460364b5
fix: disposed asset creates inconsistencies in asset depr report (#22021) 2020-05-29 10:18:06 +05:30
Deepesh Garg
1f3fe59e36
fix: Default period start date and period end date for financial statements (#22011) 2020-05-28 18:36:21 +05:30
mergify[bot]
fd351f8268
fix: set fiscal year for Profit and Loss chart (#22006) 
(cherry picked from commit 4afda7601574a93e9232d06341556dbcf0f142ab)

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
 2020-05-28 15:18:47 +05:30
Shivam Mishra
4afda76015 fix: set fiscal year for Profit and Loss chart 2020-05-28 15:06:38 +05:30
rohitwaghchaure
af91e13435
Merge pull request #22001 from nextchamp-saqib/price-rule-date-field-fix 
fix: transaction date not found in sales invoice
 2020-05-28 14:38:13 +05:30
Deepesh Garg
cfcdd52bf4
fix: Inter-company Invoice currency for multicurrency transactions (#21984) 2020-05-28 13:35:29 +05:30
Saqib Ansari
dd39ba0014 chore: tests 2020-05-28 13:11:04 +05:30
Saqib Ansari
603cc3d05e fix: transaction date not found in sales invoice 2020-05-28 12:49:33 +05:30
Deepesh Garg
6fe3a24c5d
Merge pull request #21986 from deepeshgarg007/tds_computation_summary 
fix: TDS computation summary report
 2020-05-27 22:49:42 +05:30
Deepesh Garg
33a08f1ea7 fix: TDS computation summary report 2020-05-27 22:44:50 +05:30