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

4693 Commits

Author SHA1 Message Date
Faris Ansari
2632107129
fix: User MultiSelectList control for Party filter (#17943) 
* fix: User MultiSelectList control for Party filter

The comma based filter wouldn't work for values that had comma in them

* fix: Replace with MultiSelectList in reports

* fix: Parse json instead of string split
 2019-06-19 12:15:37 +05:30
rohitwaghchaure
226ff5a797
Merge pull request #17964 from rohitwaghchaure/bank_guarantee_project_not_found_error_develop 
fix: bank guarantee, not able to select the purchase order
 2019-06-18 11:31:01 +05:30
Rohit Waghchaure
4803e817e9 fix: bank guarantee, not able to select the purchase order 2019-06-17 17:40:40 +05:30
Rushabh Mehta
803f784351 fix(minor): format date in user format for accounting dashboard 2019-06-17 17:33:24 +05:30
Rohit Waghchaure
b821af44b6 fix: revert group by voucher general ledger changes 2019-06-17 07:42:53 +05:30
rohitwaghchaure
a030138df8 fix: trial balance opening balance not showing in the debit side for the liability account (#17944) 2019-06-14 11:57:14 +05:30
Anurag Mishra
122cdaf87b fix: column width (#17935) 2019-06-14 11:29:18 +05:30
rohitwaghchaure
da0d056a06
Merge pull request #17924 from rohitwaghchaure/cost_center_added_in_the_opening_invoice_creation 
feat: added cost center in the opening invoice creation tool
 2019-06-13 16:27:18 +05:30
Rohit Waghchaure
033ed93586 fix: taxes are not overriding after changing the taxes template 2019-06-13 15:47:42 +05:30
Rohit Waghchaure
02ae934d5c feat: added cost center in the opening invoice creation tool 2019-06-13 12:00:30 +05:30
Rushabh Mehta
26dba8bb89
Merge pull request #17801 from deepeshgarg007/dashboards 
fix: Dashboards for doctypes in accounts module
 2019-06-12 17:15:58 +05:30
Anurag Mishra
ff99cea1c4
Merge branch 'develop' into report_trial_balance_fix 2019-06-11 14:17:54 +05:30
rohitwaghchaure
ba715feb7f
Merge pull request #17899 from rohitwaghchaure/general_ledger_group_by_voucher_consolidated_issue_develop 
fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated)
 2019-06-11 11:39:48 +05:30
Anurag Mishra
0ef811d92d
Merge branch 'develop' into report_trial_balance_fix 2019-06-11 11:14:02 +05:30
Anurag Mishra
acae7a903b fix: requested changes 2019-06-11 11:12:28 +05:30
Rohit Waghchaure
ef5dd87928 fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated) 2019-06-10 18:34:18 +05:30
rohitwaghchaure
3199f695aa
Merge pull request #17897 from rohitwaghchaure/fixed_print_format_for_ar_for_120_days_develop 
fix: accounts receivable for PDC not showing 120 days column
 2019-06-10 18:16:59 +05:30
Rohit Waghchaure
5f41a3333b fix: accounts receivable for PDC not showing 120 days column 2019-06-10 18:15:43 +05:30
Deepesh Garg
ebeafa55ca fix: Total Amount fix in journal entry (#17880) 2019-06-10 17:42:52 +05:30
Rohit Waghchaure
3cf24366a9 feat: provision to set multiple manufacturer in the item master 2019-06-06 19:53:32 +05:30
Anurag Mishra
fd19678bc7 fix: show cost center in print fromat of report trial balance 2019-06-06 18:37:10 +05:30
Prasann Shah
829172c267 [Add] GSTIN filters in hsn wise summary and itemised reports 2019-06-06 12:08:09 +05:30
Nabin Hait
68eaaa068b
fix: Removed unwanted total row from financial statement and general ledger print (#17860) 2019-06-05 20:29:24 +05:30
Aditya Hase
811bed32c1 fix(naming): Limit number of docs to be renamed to 50000 per doctype (#17827) 
If total docs to be renamed goes over 100000 then the total number of
writes exceed 200000 and check_transaction_status (database.py)
raises a Validation Error

This causes failure in the job being executed currently and every single job
triggered afterwards.
 2019-06-05 10:26:26 +05:30
Mangesh-Khairnar
da2e009990 fix(payment-order): filter already created payment entries (#17843) 2019-06-05 10:22:05 +05:30
deepeshgarg007
1831844fcf fix: Dashboard for cost center 2019-06-03 21:53:58 +05:30
Rohit Waghchaure
8309582cca fix: report Payment Period Based On Invoice Date not working 2019-06-03 18:23:54 +05:30
deepeshgarg007
290847df46 fix: Fixes in accounting doctype dashboards 2019-06-02 19:35:18 +05:30
deepeshgarg007
6d313c72e1 fix: Remove diemnsion from value list if present 2019-06-01 23:26:42 +05:30
deepeshgarg007
55b894bfef Merge branch develop into dimensions 2019-06-01 23:13:36 +05:30
deepeshgarg007
223225e785 fix: Update function name 2019-06-01 23:09:04 +05:30
deepeshgarg007
ce15591872 Merge branch 'develop' of https://github.com/frappe/erpnext into dashboards 2019-06-01 22:57:51 +05:30
Deepesh Garg
25857d6ee3
Merge pull request #17816 from deepeshgarg007/ar_translations_develop 
fix: Add translations for missing labels in AR report
 2019-05-31 12:37:36 +05:30
Rohit Waghchaure
840244c562 fix: pricing rule is applying on the incorrect item 2019-05-31 12:16:35 +05:30
deepeshgarg007
480586152b fix: Label translations 2019-05-30 22:34:00 +05:30
deepeshgarg007
da2e456f70 fix: Add translations for missing labels in AR report 2019-05-30 22:30:32 +05:30
Rohit Waghchaure
ac8f4b449d fix: pricing rule not exists issue 2019-05-30 22:24:24 +05:30
deepeshgarg007
52ea2874ec fix: Multiple fixes in accounting dimensions 2019-05-30 22:09:36 +05:30
deepeshgarg007
a9b2e4e4a8 fix: White space in subscription plan dashboard 2019-05-30 12:18:10 +05:30
deepeshgarg007
e233708754 fix: Tax category dashboard 2019-05-30 12:14:16 +05:30
deepeshgarg007
4baf69656d Merge branch 'develop' of https://github.com/frappe/erpnext into dashboards 2019-05-30 11:54:31 +05:30
deepeshgarg007
8f3a6c1596 fix: Dashboards for doctypes in accounting modules 2019-05-30 11:53:12 +05:30
deepeshgarg007
c97c7c51a9 fix: Test cases for accounting dimension 2019-05-28 18:51:10 +05:30
deepeshgarg007
233b88dc52 fix: Test case fixes 2019-05-28 17:58:22 +05:30
deepeshgarg007
ffec8be85f fix: Styling and test case fixes 2019-05-28 17:56:07 +05:30
deepeshgarg007
a8cb00f31f fix: Styling and test case fixes 2019-05-28 16:03:08 +05:30
deepeshgarg007
adccb2c3a4 fix: Remove print statements 2019-05-28 12:24:28 +05:30
deepeshgarg007
acc2422167 Merge branch develop into dimensions 2019-05-28 12:18:32 +05:30
deepeshgarg007
f5b6ee9ae7 fix: Multiple fixes in accounting doctype 2019-05-28 12:15:56 +05:30
deepeshgarg007
7dfffb5f73 fix: Updated test cases for accounting dimensions 2019-05-28 12:09:45 +05:30